diff --git a/.vs/CMake Overview b/.vs/CMake Overview
deleted file mode 100644
index e69de29..0000000
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
deleted file mode 100644
index 38c5f00..0000000
--- a/.vs/ProjectSettings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": "x86-Debug"
-}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
deleted file mode 100644
index 2a11e55..0000000
--- a/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ExpandedNodes": [
-    "",
-    "\\REDALERT"
-  ],
-  "SelectedNode": "\\REDALERT\\INIT.CPP",
-  "PreviewInSolutionExplorer": false
-}
\ No newline at end of file
diff --git a/.vs/cmake.db b/.vs/cmake.db
deleted file mode 100644
index 310343d..0000000
Binary files a/.vs/cmake.db and /dev/null differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
deleted file mode 100644
index 4de6fe6..0000000
Binary files a/.vs/slnx.sqlite and /dev/null differ
diff --git a/.vs/tasks.vs.json b/.vs/tasks.vs.json
deleted file mode 100644
index 78c226b..0000000
--- a/.vs/tasks.vs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "version": "0.2.1",
-  "tasks": [
-    {
-      "taskLabel": "task-CMakeLists",
-      "appliesTo": "CMakeLists.txt",
-      "type": "launch"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/code/REDALERT/WIN32LIB/MOUSEWW.CPP b/code/REDALERT/WIN32LIB/MOUSEWW.CPP
index d2a27a1..5bf3f2a 100644
--- a/code/REDALERT/WIN32LIB/MOUSEWW.CPP
+++ b/code/REDALERT/WIN32LIB/MOUSEWW.CPP
@@ -236,7 +236,7 @@ void WWMouseClass::Hide_Mouse()
 }
 
 void WWMouseClass::RenderMouse(void) {
-	if (!isMouseVisible)
+	if( this == NULL || !isMouseVisible)
 		return;
 
 	//ImVec2 size(current_cursor->width, current_cursor->height);
diff --git a/DevIL.dll b/code/external/devil/DevIL.dll
similarity index 100%
rename from DevIL.dll
rename to code/external/devil/DevIL.dll