diff --git a/source/common/version.h b/source/common/version.h
index 7e221b011a3..0d4a6e3abf1 100644
--- a/source/common/version.h
+++ b/source/common/version.h
@@ -41,16 +41,16 @@ const char *GetVersionString();
 
 /** Lots of different version numbers **/
 
-#define VERSIONSTR "0.5.1 alpha"
+#define VERSIONSTR "0.6.0 alpha"
 
 // The version as seen in the Windows resource
-#define RC_FILEVERSION 0,5,1,0
-#define RC_PRODUCTVERSION 0,5,1,0
+#define RC_FILEVERSION 0,6,0,0
+#define RC_PRODUCTVERSION 0,6,0,0
 #define RC_PRODUCTVERSION2 VERSIONSTR
 // These are for content versioning.
 #define VER_MAJOR 0
-#define VER_MINOR 5
-#define VER_REVISION 1
+#define VER_MINOR 6
+#define VER_REVISION 0
 
 // More stuff that needs to be different for derivatives.
 #define GAMENAME "Raze"
@@ -66,13 +66,13 @@ const char *GetVersionString();
 #define SAVESIG_SW GAMENAME ".ShadowWarrior"
 #define SAVESIG_PS GAMENAME ".Exhumed"
 
-#define MINSAVEVER_DN3D 6
+#define MINSAVEVER_DN3D 7
 #define MINSAVEVER_BLD 6
 #define MINSAVEVER_RR 6
 #define MINSAVEVER_SW 6
 #define MINSAVEVER_PS 6
 
-#define SAVEVER_DN3D 6
+#define SAVEVER_DN3D 7
 #define SAVEVER_BLD 6
 #define SAVEVER_RR 6
 #define SAVEVER_SW 6
diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp
index 25268b3b593..f841be7ecfe 100644
--- a/source/duke3d/src/game.cpp
+++ b/source/duke3d/src/game.cpp
@@ -5163,7 +5163,7 @@ static void G_Cleanup(void)
 #if !defined LUNATIC
     if (label != (char *)&sprite[0]) Xfree(label);
     if (labelcode != (int32_t *)&sector[0]) Xfree(labelcode);
-    if (labeltype != (int32_t*)&wall[0]) Xfree(labeltype);
+    if (labeltype != (uint8_t*)&wall[0]) Xfree(labeltype);
     Xfree(apScript);
     Xfree(bitptr);
 
diff --git a/source/duke3d/src/namesdyn.cpp b/source/duke3d/src/namesdyn.cpp
index 00bb999e75f..65d933ea294 100644
--- a/source/duke3d/src/namesdyn.cpp
+++ b/source/duke3d/src/namesdyn.cpp
@@ -1374,7 +1374,5 @@ void G_InitDynamicTiles(void)
     WeaponPickupSprites[10] = HEAVYHBOMB;
     WeaponPickupSprites[11] = SHRINKERSPRITE;
     WeaponPickupSprites[12] = FLAMETHROWERSPRITE;
-
-#endif
 }
 END_DUKE_NS