diff --git a/forge/install/install.cmd b/forge/install/install.cmd
index 7c4f21541f..345b0f6f0a 100755
--- a/forge/install/install.cmd
+++ b/forge/install/install.cmd
@@ -49,6 +49,7 @@ popd >nul
 
 xcopy /Y /E forge\src\* src
 
-cmd /C updatemcp.bat
-cmd /C updatenames.bat
+rem Removed until MCP's Update Names is fixed
+rem cmd /C updatemcp.bat
+rem cmd /C updatenames.bat
 cmd /C updatemd5.bat
\ No newline at end of file
diff --git a/forge/install/install.sh b/forge/install/install.sh
index 9b09dde9ba..90989e6c4c 100644
--- a/forge/install/install.sh
+++ b/forge/install/install.sh
@@ -53,7 +53,7 @@ popd > /dev/null
 
 cp -r forge/src/* src
 
-
-./updatemcp.sh
-./updatenames.sh
+# Removed until MCP's UpdateNames Is fixed
+#./updatemcp.sh
+#./updatenames.sh
 ./updatemd5.sh
\ No newline at end of file
diff --git a/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch
deleted file mode 100644
index b021d5eda7..0000000000
--- a/forge/patches/minecraft/net/minecraft/src/Packet230ModLoader.java.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/Packet230ModLoader.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/Packet230ModLoader.java	0000-00-00 00:00:00.000000000 -0000
-@@ -71,7 +71,11 @@
-                         }));
-             }
-             byte abyte0[] = new byte[k1];
--            datainputstream.read(abyte0, 0, k1);
-+            int bytesRead = 0;
-+            while (bytesRead < k1) 
-+            {
-+                bytesRead += datainputstream.read(abyte0, bytesRead, k1 - bytesRead);
-+            }
-             dataString[j1] = new String(abyte0);
-         }
-     }
diff --git a/forge/patches/minecraft/net/minecraft/src/Packet250CustomPayload.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet250CustomPayload.java.patch
new file mode 100644
index 0000000000..00f3194587
--- /dev/null
+++ b/forge/patches/minecraft/net/minecraft/src/Packet250CustomPayload.java.patch
@@ -0,0 +1,11 @@
+--- ../src_base/minecraft/net/minecraft/src/Packet250CustomPayload.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft/net/minecraft/src/Packet250CustomPayload.java	0000-00-00 00:00:00.000000000 -0000
+@@ -20,7 +20,7 @@
+         if (length > 0 && length < 32767)
+         {
+             data = new byte[length];
+-            datainputstream.read(data);
++            datainputstream.readFully(data);
+         }
+     }
+ 
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch
deleted file mode 100644
index c31856a20d..0000000000
--- a/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../src_base/minecraft_server/net/minecraft/src/Packet230ModLoader.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft_server/net/minecraft/src/Packet230ModLoader.java	0000-00-00 00:00:00.000000000 -0000
-@@ -74,7 +74,11 @@
-                         }));
-             }
-             byte abyte0[] = new byte[k1];
--            datainputstream.read(abyte0, 0, k1);
-+            int bytesRead = 0;
-+            while (bytesRead < k1) 
-+            {
-+                bytesRead += datainputstream.read(abyte0, bytesRead, k1 - bytesRead);
-+            }
-             dataString[j1] = new String(abyte0);
-         }
-     }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet250CustomPayload.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet250CustomPayload.java.patch
new file mode 100644
index 0000000000..3bcf5a6e18
--- /dev/null
+++ b/forge/patches/minecraft_server/net/minecraft/src/Packet250CustomPayload.java.patch
@@ -0,0 +1,11 @@
+--- ../src_base/minecraft_server/net/minecraft/src/Packet250CustomPayload.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft_server/net/minecraft/src/Packet250CustomPayload.java	0000-00-00 00:00:00.000000000 -0000
+@@ -20,7 +20,7 @@
+         if (length > 0 && length < 32767)
+         {
+             data = new byte[length];
+-            datainputstream.read(data);
++            datainputstream.readFully(data);
+         }
+     }
+