diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index 53b61bfa0a9b54c901dcaff13d7bafdc64b90467..776c3bb95789b9ab66dedca8e9ab298edf921989 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -13,4 +13,9 @@ INCLUDE_DIRECTORIES(
         .
 )
 
+# Add logog subdirectory and group its targets in a Visual Studio folder
 ADD_SUBDIRECTORY(logog)
+SET_PROPERTY(TARGET Continuous PROPERTY FOLDER "logog")
+SET_PROPERTY(TARGET logog PROPERTY FOLDER "logog")
+SET_PROPERTY(TARGET logog-doc PROPERTY FOLDER "logog")
+SET_PROPERTY(TARGET test-logog PROPERTY FOLDER "logog")
\ No newline at end of file
diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index 72a7e8c67b8d94b8387020efa49bb0410c8df67f..15cbb475bf459e28c56fb3d4f991221a714d354a 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -1,5 +1,6 @@
 INCLUDE(ResetConfigurations)        # To Debug, Release, RelWithDbgInfo
 INCLUDE(SetDefaultBuildType)
+INCLUDE(DisableCompilerFlag)
 SET_DEFAULT_BUILD_TYPE(Debug)
 INCLUDE(MSVCMultipleProcessCompile) # /MP switch (multi processor) for VS
 
@@ -67,6 +68,8 @@ IF (WIN32)
 		)
 		# Sets warning level 3 and ignores some warnings
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /wd4290 /wd4267")
+
+		DisableCompilerFlag(DEBUG /RTC1)
 	# cygwin
 	ELSE (MSVC)
 		MESSAGE (STATUS "Might be GCC under cygwin.")
diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake
index 53984c425469a1b4bf0babf482aefb39b674eda1..73d6907bf50c13046407c4d7fcf523613729d577 100644
--- a/scripts/cmake/ProjectSetup.cmake
+++ b/scripts/cmake/ProjectSetup.cmake
@@ -12,3 +12,6 @@ IF(NOT DEFINED OGS_LOG_LEVEL)
 ELSE()
 	ADD_DEFINITIONS(-DLOGOG_LEVEL=${OGS_LOG_LEVEL})
 ENDIF() # NOT DEFINED OGS_LOG_LEVEL
+
+# Enable Visual Studio project folder grouping
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
\ No newline at end of file
diff --git a/scripts/cmake/cmake/DisableCompilerFlag.cmake b/scripts/cmake/cmake/DisableCompilerFlag.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..dda3dc7041bdf57f494900592f6dde972c4868ad
--- /dev/null
+++ b/scripts/cmake/cmake/DisableCompilerFlag.cmake
@@ -0,0 +1,20 @@
+# DisableCompilerFlag.cmake
+#
+# 2012-05-14 Lars Bilke
+#
+# Removes the given FLAG from the compiler flags in the given CONFIGURATION.
+# The Configuration must be uppercased.
+#
+# Usage:
+# 
+#   include(DisableCompilerFlag)
+#   if (MSVC)
+#     DisableCompilerFlag(DEBUG /RTC1)
+#   endif ()
+
+macro(DisableCompilerFlag CONFIGURATION FLAG)
+	if(CMAKE_CXX_FLAGS_${CONFIGURATION} MATCHES "${FLAG}")
+		string(REPLACE "${FLAG}" " " CMAKE_CXX_FLAGS_${CONFIGURATION} "${CMAKE_CXX_FLAGS_${CONFIGURATION}}")
+		# message(STATUS ${PROJECT_NAME}  " CMAKE_CXX_FLAGS_${CONFIGURATION} removing ${FLAG}")
+	endif()
+endmacro()
\ No newline at end of file