diff --git a/desktop_version/src/Graphics.h b/desktop_version/src/Graphics.h
index 37b69b71..cdf53853 100644
--- a/desktop_version/src/Graphics.h
+++ b/desktop_version/src/Graphics.h
@@ -19,6 +19,11 @@
 #include "GraphicsUtil.h"
 #include "Screen.h"
 
+#if __cplusplus < 201103L  // Pre-C++11
+typedef uint32_t char32_t;
+typedef uint16_t char16_t;
+#endif
+
 class map;
 
 class Graphics
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index 85c2e7eb..65d8e580 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -355,6 +355,8 @@ void editorclass::reset()
     hookmenu=0;
     numhooks=0;
     script.customscript.clear();
+
+    returneditoralpha = 0;
 }
 
 void editorclass::weirdloadthing(std::string t)
diff --git a/desktop_version/src/editor.h b/desktop_version/src/editor.h
index ad65694a..6498e26a 100644
--- a/desktop_version/src/editor.h
+++ b/desktop_version/src/editor.h
@@ -237,7 +237,7 @@ class editorclass{
   int dmtile;
   int dmtileeditor;
 
-  int returneditoralpha = 0;
+  int returneditoralpha;
 };
 
 void addedentity(int xp, int yp, int tp, int p1=0, int p2=0, int p3=0, int p4=0, int p5=320, int p6=240);