diff --git a/JGE/JGE.vcproj b/JGE/JGE.vcproj
index da2b024de..0560af45f 100644
--- a/JGE/JGE.vcproj
+++ b/JGE/JGE.vcproj
@@ -507,10 +507,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\src\JInputSystem.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\JLBFont.cpp"
 				>
@@ -757,10 +753,6 @@
 				RelativePath="include\JGui.h"
 				>
 			</File>
-			<File
-				RelativePath=".\include\JInputSystem.h"
-				>
-			</File>
 			<File
 				RelativePath="include\JLBFont.h"
 				>
diff --git a/JGE/src/JGE.cpp b/JGE/src/JGE.cpp
index 1e5c4131f..e42c68445 100644
--- a/JGE/src/JGE.cpp
+++ b/JGE/src/JGE.cpp
@@ -10,6 +10,7 @@
 
 #include <iostream>
 #include <map>
+#include <limits>
 
 #include "../include/JGE.h"
 #include "../include/JApp.h"
@@ -105,7 +106,7 @@ void JGE::HoldKey_NoRepeat(const LocalKeySym sym)
     {
       keyBuffer.push(it->second);
       if (holds.end() == holds.find(it->second))
-        holds[it->second] = NAN;
+        holds[it->second] = std::numeric_limits<float>::quiet_NaN();
     }
 }
 void JGE::HoldKey(const JButton sym)
@@ -116,7 +117,7 @@ void JGE::HoldKey(const JButton sym)
 void JGE::HoldKey_NoRepeat(const JButton sym)
 {
   keyBuffer.push(sym);
-  if (holds.end() == holds.find(sym)) holds[sym] = NAN;
+  if (holds.end() == holds.find(sym)) holds[sym] = std::numeric_limits<float>::quiet_NaN();
 }
 void JGE::ReleaseKey(const LocalKeySym sym)
 {
diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp
index 6cb0e426e..3b1fc496b 100644
--- a/projects/mtg/src/GameStateDeckViewer.cpp
+++ b/projects/mtg/src/GameStateDeckViewer.cpp
@@ -48,8 +48,8 @@ GameStateDeckViewer::~GameStateDeckViewer() {
     SAFE_DELETE(myDeck->parent);
     SAFE_DELETE(myDeck);
   }
-  if(myCollection{
-    SAFE_DELETE(myCollection->parent)
+  if(myCollection){
+    SAFE_DELETE(myCollection->parent);
     SAFE_DELETE(myCollection);
   }
   SAFE_DELETE(filterDeck);
@@ -221,8 +221,8 @@ void GameStateDeckViewer::End()
   SAFE_DELETE(menu);
 
   resources.Release(pspIconsTexture);
-  if(myCollection{
-    SAFE_DELETE(myCollection->parent)
+  if(myCollection){
+    SAFE_DELETE(myCollection->parent);
     SAFE_DELETE(myCollection);
   }
   if(myDeck){