--- src/common/engine/i_interface.cpp
+++ src/common/engine/i_interface.cpp
@@ -6,13 +6,13 @@
 #include "gstrings.h"
 #include "version.h"
 
-static_assert(sizeof(void*) == 8,
-	"Only LP64/LLP64 builds are officially supported. "
-	"Please do not attempt to build for other platforms; "
-	"even if the program succeeds in a MAP01 smoke test, "
-	"there are e.g. known visual artifacts "
-	"<https://forum.zdoom.org/viewtopic.php?f=7&t=75673> "
-	"that lead to a bad user experience.");
+//static_assert(sizeof(void*) == 8,
+//	"Only LP64/LLP64 builds are officially supported. "
+//	"Please do not attempt to build for other platforms; "
+//	"even if the program succeeds in a MAP01 smoke test, "
+//	"there are e.g. known visual artifacts "
+//	"<https://forum.zdoom.org/viewtopic.php?f=7&t=75673> "
+//	"that lead to a bad user experience.");
 
 // Some global engine variables taken out of the backend code.
 FStartupScreen* StartWindow;
--- src/common/platform/posix/sdl/sdlglvideo.cpp
+++ src/common/platform/posix/sdl/sdlglvideo.cpp
@@ -400,7 +400,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffe
 				builder.RequireExtension(names[i]);
 			auto instance = builder.Create();
 
-			VkSurfaceKHR surfacehandle = nullptr;
+			VkSurfaceKHR surfacehandle = VK_NULL_HANDLE;
 			if (!I_CreateVulkanSurface(instance->Instance, &surfacehandle))
 				VulkanError("I_CreateVulkanSurface failed");
 
--- src/common/platform/win32/i_mainwindow.cpp
+++ src/common/platform/win32/i_mainwindow.cpp
@@ -164,7 +164,7 @@ void MainWindow::GetLog(std::function<bo
 		size_t len = line.Len();
 		while (pos < len)
 		{
-			uint32_t size = (uint32_t)std::min(len - pos, 0x0fffffffULL);
+			uint32_t size = (uint32_t)std::min(len - pos, static_cast<uint32_t>(0x0fffffffULL));
 			uint32_t written = 0;
 			if (!writeData(&line[pos], size, written))
 				return;
--- src/common/platform/win32/win32vulkanvideo.h
+++ src/common/platform/win32/win32vulkanvideo.h
@@ -37,7 +37,7 @@ public:
 			builder.RequireExtension(names[i]);
 		auto instance = builder.Create();
 
-		VkSurfaceKHR surfacehandle = nullptr;
+		VkSurfaceKHR surfacehandle = VK_NULL_HANDLE;
 		if (!I_CreateVulkanSurface(instance->Instance, &surfacehandle))
 			VulkanError("I_CreateVulkanSurface failed");
 
--- src/common/models/bonecomponents.h
+++ src/common/models/bonecomponents.h
@@ -47,7 +47,7 @@ struct ModelAnim
 	double switchOffset = 0; // when the animation was changed -- where to interpolate the switch from
 };
 
-static_assert(sizeof(ModelAnim) == sizeof(double) * 6);
+//static_assert(sizeof(ModelAnim) == sizeof(double) * 6);
 
 using ModelAnimFrame = std::variant<std::nullptr_t, ModelAnimFrameInterp, ModelAnimFramePrecalculatedIQM>;
 
--- src/playsim/p_effect.h
+++ src/playsim/p_effect.h
@@ -92,7 +92,7 @@ struct particle_t
 	FStandaloneAnimation animData; //+16 = 128
 };
 
-static_assert(sizeof(particle_t) == 128, "Only LP64/LLP64 is supported");
+//static_assert(sizeof(particle_t) == 128, "Only LP64/LLP64 is supported");
 
 const uint16_t NO_PARTICLE = 0xffff;
 
--- tools/updaterevision/UpdateRevision.cmake
+++ tools/updaterevision/UpdateRevision.cmake
@@ -16,7 +16,7 @@ endmacro()
 # from source repository.  If anything goes wrong return something in "Error."
 function(query_repo_info)
 	execute_process(
-		COMMAND git describe --tags --dirty=-m
+		COMMAND git describe --tags
 		RESULT_VARIABLE Error
 		OUTPUT_VARIABLE Tag
 		ERROR_QUIET