diff --git a/LaunchServer/source/response/ServerSocketHandler.java b/LaunchServer/source/response/ServerSocketHandler.java
index 4131ec5..60cdf87 100644
--- a/LaunchServer/source/response/ServerSocketHandler.java
+++ b/LaunchServer/source/response/ServerSocketHandler.java
@@ -64,7 +64,7 @@
 			// Set socket params
 			serverSocket.setReuseAddress(true);
 			serverSocket.setPerformancePreferences(1, 0, 2);
-			serverSocket.setReceiveBufferSize(0x10000);
+			//serverSocket.setReceiveBufferSize(0x10000);
 			serverSocket.bind(server.config.getSocketAddress());
 			LogHelper.info("Server socket thread successfully started");
 
diff --git a/Launcher/source/helper/IOHelper.java b/Launcher/source/helper/IOHelper.java
index 5e41a8f..3b6d718 100644
--- a/Launcher/source/helper/IOHelper.java
+++ b/Launcher/source/helper/IOHelper.java
@@ -474,21 +474,22 @@
 	@LauncherAPI
 	public static void setSocketFlags(Socket socket) throws SocketException {
 		// Set socket flags
-		socket.setKeepAlive(false);
+		socket.setKeepAlive(false); // TODO To socket channels
 		socket.setTcpNoDelay(false);
 		socket.setReuseAddress(true);
 
 		// Set socket options
 		socket.setSoTimeout(SOCKET_TIMEOUT);
 		socket.setTrafficClass(0b11100);
-		socket.setSendBufferSize(0x100000);
-		socket.setReceiveBufferSize(0x100000);
+		// Allow OS to adjust buffer sizes
+//		socket.setSendBufferSize(0x100000);
+//		socket.setReceiveBufferSize(0x100000);
 		socket.setPerformancePreferences(1, 0, 2);
 	}
 
 	@LauncherAPI
 	public static Path toPath(String path) {
-		return Paths.get(path.replace(PLATFORM_SEPARATOR, CROSS_SEPARATOR));
+		return Paths.get(path.replace(CROSS_SEPARATOR, PLATFORM_SEPARATOR));
 	}
 
 	@LauncherAPI