diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml
index 66901791c..0a29cdcef 100644
--- a/.github/workflows/github.yml
+++ b/.github/workflows/github.yml
@@ -103,7 +103,7 @@ jobs:
             pack: 1
             cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
             extension: exe
-            cmake_args: -G Ninja -DENABLE_EDITOR=0
+            cmake_args: -G Ninja
           - platform: msvc
             os: windows-latest
             test: 0
diff --git a/mapeditor/StdInc.h b/mapeditor/StdInc.h
index ff91472b9..7aeb0d5ea 100644
--- a/mapeditor/StdInc.h
+++ b/mapeditor/StdInc.h
@@ -13,13 +13,15 @@
 #include <QString>
 #include <QFile>
 
-using NumericPointer = unsigned long long;
+
+using NumericPointer = typename std::conditional<sizeof(void *) == sizeof(unsigned long long),
+												 unsigned long long, unsigned int>::type;
 
 template<class Type>
 NumericPointer data_cast(Type * _pointer)
 {
 	static_assert(sizeof(Type *) == sizeof(NumericPointer),
-				  "Compiled for 64 bit arcitecture. Use NumericPointer = unsigned int");
+				  "Cannot compile for that architecture, see NumericPointer definition");
 
 	return reinterpret_cast<NumericPointer>(_pointer);
 }
@@ -28,7 +30,7 @@ template<class Type>
 Type * data_cast(NumericPointer _numeric)
 {
 	static_assert(sizeof(Type *) == sizeof(NumericPointer),
-				  "Compiled for 64 bit arcitecture. Use NumericPointer = unsigned int");
+				  "Cannot compile for that architecture, see NumericPointer definition");
 
 	return reinterpret_cast<Type *>(_numeric);
 }