diff --git a/Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h b/Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h
index 7b003fa5a..370c597cf 100644
--- a/Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h
+++ b/Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h
@@ -62,7 +62,7 @@ public:
 	void StartFrame();
 	void DoScreenGrabOnNextPresent();
 	void Present();
-	void Clear(int flags, D3D11_RECT *pRect = NULL);
+	void Clear(int flags);
 	void SetClearColour(const float colourRGBA[4]);
 	bool IsWidescreen();
 	bool IsHiDef();
@@ -160,7 +160,7 @@ public:
 	HRESULT SaveTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int *ppDataOut);
 	HRESULT SaveTextureDataToMemory(void *pOutput, int outputCapacity, int *outputLength, int width, int height, int *ppDataIn);
 	void TextureGetStats();
-	ID3D11ShaderResourceView  *TextureGetTexture(int idx);
+	Gnm::Texture  *TextureGetTexture(int idx);
 
 	// State control
 	void StateSetColour(float r, float g, float b, float a);
diff --git a/Minecraft.World/CompoundTag.h b/Minecraft.World/CompoundTag.h
index 32c315833..e8919cc69 100644
--- a/Minecraft.World/CompoundTag.h
+++ b/Minecraft.World/CompoundTag.h
@@ -117,7 +117,7 @@ public:
 
     void putBoolean(wchar_t * string, bool val)
 	{
-        putByte(string, val?(byte)1:0);
+        putByte(string, val?static_cast<std::byte>(1):static_cast<std::byte>(0));
     }
 
     Tag *get(wchar_t *name)
@@ -200,7 +200,7 @@ public:
 
     bool getBoolean(wchar_t *string)
 	{
-        return getByte(string)!=0;
+        return getByte(string) != static_cast<std::byte>(0);
     }
 
 	void remove(const wstring &name)
diff --git a/Minecraft.World/FileHeader.h b/Minecraft.World/FileHeader.h
index 203ec322a..1cba1bb22 100644
--- a/Minecraft.World/FileHeader.h
+++ b/Minecraft.World/FileHeader.h
@@ -64,6 +64,9 @@ enum ESavePlatform
 	SAVE_FILE_PLATFORM_LOCAL = SAVE_FILE_PLATFORM_PSVITA
 #elif defined _WINDOWS64
 	SAVE_FILE_PLATFORM_LOCAL = SAVE_FILE_PLATFORM_WIN64
+#else
+	// DecalOverdose(HACK + TODO)
+	SAVE_FILE_PLATFORM_LOCAL = SAVE_FILE_PLATFORM_WIN64
 #endif
 };
 #define SAVE_FILE_VERSION_NUMBER (SAVE_FILE_VERSION_NEXT - 1)
diff --git a/Minecraft.World/ListTag.h b/Minecraft.World/ListTag.h
index 9deeb22d6..ade58a37c 100644
--- a/Minecraft.World/ListTag.h
+++ b/Minecraft.World/ListTag.h
@@ -15,7 +15,7 @@ public:
     void write(DataOutput *dos)
 	{
         if (list.size() > 0) type = (list[0])->getId();
-        else type = 1;
+        else type = static_cast<std::byte>(1);
 
         dos->writeByte(type);
         dos->writeInt((int)list.size());
@@ -49,7 +49,7 @@ public:
 
     void print(char *prefix, ostream out)
 	{
-        Tag::print(prefix, out);
+        printf(prefix);
 
 		out << prefix << "{" << endl;
 
@@ -58,7 +58,7 @@ public:
 		strcat( newPrefix, "   ");
 		AUTO_VAR(itEnd, list.end());
         for (AUTO_VAR(it, list.begin()); it != itEnd; it++)
-            (*it)->print(newPrefix, out);
+            printf(newPrefix);
 		delete[] newPrefix;
 		out << prefix << "}" << endl;
 	}
@@ -141,4 +141,4 @@ public:
 		return false;
 	}
 #endif
-};
\ No newline at end of file
+};
diff --git a/Minecraft.World/Tag.h b/Minecraft.World/Tag.h
index c3221aea1..4c96b9812 100644
--- a/Minecraft.World/Tag.h
+++ b/Minecraft.World/Tag.h
@@ -7,18 +7,18 @@ using namespace std;
 class Tag
 {
 public:
-    static const byte TAG_End = 0;
-    static const byte TAG_Byte = 1;
-    static const byte TAG_Short = 2;
-    static const byte TAG_Int = 3;
-    static const byte TAG_Long = 4;
-    static const byte TAG_Float = 5;
-    static const byte TAG_Double = 6;
-    static const byte TAG_Byte_Array = 7;
-    static const byte TAG_String = 8;
-    static const byte TAG_List = 9;
-    static const byte TAG_Compound = 10;
-	static const byte TAG_Int_Array = 11;
+    static const byte TAG_End = static_cast<std::byte>(0);
+    static const byte TAG_Byte = static_cast<std::byte>(1);
+    static const byte TAG_Short = static_cast<std::byte>(2);
+    static const byte TAG_Int = static_cast<std::byte>(3);
+    static const byte TAG_Long = static_cast<std::byte>(4);
+    static const byte TAG_Float = static_cast<std::byte>(5);
+    static const byte TAG_Double = static_cast<std::byte>(6);
+    static const byte TAG_Byte_Array = static_cast<std::byte>(7);
+    static const byte TAG_String = static_cast<std::byte>(8);
+    static const byte TAG_List = static_cast<std::byte>(9);
+    static const byte TAG_Compound = static_cast<std::byte>(10);
+	static const byte TAG_Int_Array = static_cast<std::byte>(11);
 
 private:
     wstring name;