diff --git a/.gitignore b/.gitignore
index de5c2ae1..60620da1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,12 +31,18 @@ Makefile
 *.sln
 *.vcxproj
 *.vcxproj.filters
+*.vcxproj.user
 openminer.dir
 openminer_common.dir
 openminer_client.dir
 openminer_server.dir
 Win32
+Debug
 Release
+RelWithDebInfo
+
+# Visual Studio
+.vs
 
 # Doxygen generated files
 doc/html
@@ -46,6 +52,7 @@ doc/latex
 client/openminer
 server/openminer_server
 *.exe
+*.dll
 
 # Misc
 *.zip
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 7b8dc64f..facb1263 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -21,8 +21,8 @@ add_dependencies(${CMAKE_PROJECT_NAME} ${CMAKE_PROJECT_NAME}_common)
 if (NOT MSVC)
 	target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -O3 -ffast-math)
 	target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -g -Wall -Wextra -Wfatal-errors -Wno-variadic-macros)
-else ()
-	target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /O2)
+#else ()
+#target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /O2)
 endif ()
 
 target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -DDEBUG_ENABLED)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 84a92b29..3539ca10 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -20,8 +20,8 @@ add_library(${CMAKE_PROJECT_NAME}_common STATIC ${SOURCE_FILES})
 if (NOT MSVC)
 	target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE -O3 -ffast-math)
 	target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE -g -Wall -Wextra -Wfatal-errors -Wno-variadic-macros)
-else ()
-	target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE /O2)
+#else ()
+#	target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE /O2)
 endif ()
 
 target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE -DDEBUG_ENABLED)
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index b042163e..b2b5f7be 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -21,8 +21,8 @@ add_dependencies(${CMAKE_PROJECT_NAME}_server ${CMAKE_PROJECT_NAME}_common)
 if (NOT MSVC)
 	target_compile_options(${CMAKE_PROJECT_NAME}_server PRIVATE -O3 -ffast-math)
 	target_compile_options(${CMAKE_PROJECT_NAME}_server PRIVATE -g -Wall -Wextra -Wfatal-errors -Wno-variadic-macros)
-else ()
-	target_compile_options(${CMAKE_PROJECT_NAME}_server PRIVATE /O2)
+#else ()
+#	target_compile_options(${CMAKE_PROJECT_NAME}_server PRIVATE /O2)
 endif ()
 
 target_compile_options(${CMAKE_PROJECT_NAME}_server PRIVATE -DDEBUG_ENABLED)