diff --git a/Minecraft.Client/Rendering/EntityRenderers/TileRenderer.h b/Minecraft.Client/Rendering/EntityRenderers/TileRenderer.h
index c5b96e4ef..29f19ef57 100644
--- a/Minecraft.Client/Rendering/EntityRenderers/TileRenderer.h
+++ b/Minecraft.Client/Rendering/EntityRenderers/TileRenderer.h
@@ -115,7 +115,7 @@ private:
                                bool render);
     float tesselateAnvilPiece(AnvilTile* tt, int x, int y, int z, int part,
                               float bottom, float width, float height,
-                              float length, bool std::rotate, bool render,
+                              float length, bool rotate, bool render,
                               int data);
 
 public:
diff --git a/Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp b/Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
index 726997e01..9c173e02a 100644
--- a/Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
+++ b/Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
@@ -260,7 +260,8 @@ LevelData* DirectoryLevelStorage::prepareLevel() {
         } else
 #endif
         {
-            getSaveFile()->setFilePointer(fileEntry, 0, NULL, FILE_BEGIN);
+            getSaveFile()->setFilePointer(fileEntry, 0,
+                                          SaveFileSeekOrigin::Begin);
 
 #ifdef _LARGE_WORLDS
             byteArray data(fileEntry->getFileSize());
diff --git a/Minecraft.World/Network/Connection.cpp b/Minecraft.World/Network/Connection.cpp
index eed63cd65..a4de80ee4 100644
--- a/Minecraft.World/Network/Connection.cpp
+++ b/Minecraft.World/Network/Connection.cpp
@@ -288,6 +288,8 @@ bool Connection::writeTick() {
             Packet::writePacket(packet, bufferedDos);
         }
 
+#endif
+
 #ifndef _CONTENT_PACKAGE
         // 4J Added for debugging
         if (!socket->isLocal()) {
diff --git a/Minecraft.World/Network/Packets/ContainerClickPacket.cpp b/Minecraft.World/Network/Packets/ContainerClickPacket.cpp
index 0c853d50f..de1e780d6 100644
--- a/Minecraft.World/Network/Packets/ContainerClickPacket.cpp
+++ b/Minecraft.World/Network/Packets/ContainerClickPacket.cpp
@@ -51,7 +51,7 @@ void ContainerClickPacket::write(DataOutputStream* dos)  // throws IOException
     dos->writeShort(slotNum);
     dos->writeByte((uint8_t)buttonNum);
     dos->writeShort(uid);
-    dos->writeBoolean(quickKey);
+    dos->writeBoolean(clickType);
 
     writeItem(item, dos);
 }
diff --git a/Minecraft.World/Recipes/Recipy.h b/Minecraft.World/Recipes/Recipy.h
index 847c1227a..d1570b216 100644
--- a/Minecraft.World/Recipes/Recipy.h
+++ b/Minecraft.World/Recipes/Recipy.h
@@ -52,9 +52,9 @@ public:
 
     // 4J-PB
     virtual bool
-        prerequisite(int iRecipe)
+        requiresRecipe(int iRecipe)
     = 0;
     virtual void
-        prerequisite(INGREDIENTS_REQUIRED* pIngReq)
+        collectRequirements(INGREDIENTS_REQUIRED* pIngReq)
     = 0;
 };
diff --git a/Minecraft.World/Stats/Achievement.cpp b/Minecraft.World/Stats/Achievement.cpp
index 1e7a701e7..cc623157e 100644
--- a/Minecraft.World/Stats/Achievement.cpp
+++ b/Minecraft.World/Stats/Achievement.cpp
@@ -76,10 +76,6 @@ Achievement::Achievement(int id, const std::wstring& name, int x, int y,
       y(y),
       prerequisite(prerequisite) {}
 
-int Achievement::getAchievementID() {
-    return id - Achievements::ACHIEVEMENT_OFFSET;
-}
-
 /**
  * @brief Marks the achievement as locally awarded only.
  * @return self
diff --git a/Minecraft.World/Util/Language.h b/Minecraft.World/Util/Language.h
index 68afb12a7..7d1526af6 100644
--- a/Minecraft.World/Util/Language.h
+++ b/Minecraft.World/Util/Language.h
@@ -3,6 +3,7 @@
 class Language {
 private:
     static Language* singleton;
+    std::unordered_map<std::wstring, std::wstring> translateTable;
 
 public:
     Language();