diff --git a/4J.Input/4J_Input.cpp b/4J.Input/4J_Input.cpp
index 5fac4355d..7fee695c2 100644
--- a/4J.Input/4J_Input.cpp
+++ b/4J.Input/4J_Input.cpp
@@ -468,8 +468,8 @@ float C_4JInput::GetJoypadStick_LX(int /*iPad*/, bool /*bCheckMenuDisplay*/) {
 float C_4JInput::GetJoypadStick_LY(int /*iPad*/, bool /*bCheckMenuDisplay*/) {
     if (!s_mouseLocked) return 0.0f;
     float v = 0.0f;
-    if (KDown(GLFW_KEY_W)) v -= 1.0f;  // W = forward = negative Y on consoles
-    if (KDown(GLFW_KEY_S)) v += 1.0f;
+    if (KDown(GLFW_KEY_W)) v += 1.0f;  // W = forward = negative Y on consoles
+    if (KDown(GLFW_KEY_S)) v -= 1.0f;
     return v;
 }
 
diff --git a/Minecraft.World/Platform/System.cpp b/Minecraft.World/Platform/System.cpp
index 07fe99bf8..b7f41b1fb 100644
--- a/Minecraft.World/Platform/System.cpp
+++ b/Minecraft.World/Platform/System.cpp
@@ -101,10 +101,9 @@ __int64 System::currentTimeMillis()
 #elif defined(__linux__)
 	struct timeval tv;
 	gettimeofday(&tv, NULL);
-	long long unix_time = tv.tv_sec;
-	long long file_time = (unix_time + 11644473600LL) * 10000000LL + tv.tv_usec * 10;
-
-	return file_time;
+	// Convert to milliseconds since unix epoch instead of windows file time 
+	// time is expecting calculation to be between 10-30 ms.
+	return (int64_t)tv.tv_sec * 1000LL + tv.tv_sec / 1000;
 #else
 
 	SYSTEMTIME UTCSysTime;