diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index f11404fd27737cf5990b96b3b13cde8c4e9b82b9..0421bf7695596aa9f83aa4b09884e573f76a552e 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -155,7 +155,7 @@ cpack_add_component(ogs_gui
 	DESCRIPTION "The graphical user interface for OpenGeoSys."
 	GROUP Applications
 )
-set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "DataExplorer" "OGS Data Explorer")
+set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "DataExplorer" "OGS Data Explorer" PARENT_SCOPE)
 set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "bin/DataExplorer.exe" "Data Explorer" PARENT_SCOPE)
 IF(APPLE)
 	RETURN()
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 07c1925deb2e969c5aaa9ac5c34a61c7f9ed06ff..ad916f98e78ec6ad50aafb1506b413cf4db749d4 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -96,6 +96,6 @@ SET_PROPERTY(TARGET OGSFileConverter PROPERTY FOLDER "Utilities")
 ### Installation ###
 ####################
 
-IF(OGS_PACKAGING)
-	INSTALL (TARGETS OGSFileConverter RUNTIME DESTINATION bin COMPONENT ogs)
-ENDIF()
+INSTALL (TARGETS OGSFileConverter RUNTIME DESTINATION bin COMPONENT ogs_cli)
+set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "OGSFileConverter" "File Converter")
+set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "bin/OGSFileConverter.exe" "File Converter" PARENT_SCOPE)
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 7c6a8b3ee21396a63d6f0fb47d631387c47e5f8d..3704b5143ca4900f59d2527dfda6fb3115f0a7a7 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -18,9 +18,6 @@ INCLUDE(GetGitRevisionDescription)
 GET_GIT_HEAD_REVISION(GIT_REFSPEC GIT_SHA1)
 STRING(SUBSTRING ${GIT_SHA1} 0 8 GIT_SHA1_SHORT)
 
-# Suppress warning on setting policies
-CMAKE_POLICY(SET CMP0011 OLD)
-
 # Get the hostname
 SITE_NAME(HOSTNAME)
 
diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index d085bd7d526ad2291b2ef6ae8de65ee416c2499f..79e78f8fb3ebab1081a0c5d027c9230f915aff4a 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -7,13 +7,13 @@ SET(CMAKE_OSX_ARCHITECTURES "x86_64")
 
 # Set compiler helper variables
 
-IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+IF (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     SET(COMPILER_IS_CLANG TRUE)
-ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ELSEIF (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
     SET(COMPILER_IS_GCC TRUE)
-ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+ELSEIF (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
     SET(COMPILER_IS_INTEL TRUE)
-ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+ELSEIF (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
     SET(COMPILER_IS_MSVC TRUE)
 ENDIF () # CMAKE_CXX_COMPILER_ID
 
diff --git a/scripts/cmake/packaging/PackagingWin.cmake b/scripts/cmake/packaging/PackagingWin.cmake
index 005a38ccd335accd2927d6f9e34c962fb932ce60..87a16027fc0e066bb6d8b0eeac5715d10fc3ebbc 100644
--- a/scripts/cmake/packaging/PackagingWin.cmake
+++ b/scripts/cmake/packaging/PackagingWin.cmake
@@ -13,6 +13,9 @@ SET(CPACK_NSIS_HELP_LINK "http://docs.opengeosys.org/assets/files/Documentation/
 SET(CPACK_NSIS_MENU_LINKS
 	"bin" "Executables folder"
 	"http://www.opengeosys.org" "Website"
-	"https://github.com/ufz/ogs" "Source code on GitHub"
-	"docs" "Documentation folder"
+	"https://github.com/ufz/ogs" "Source code on GitFHub"
+	PARENT_SCOPE
 )
+IF(OGS_DOWNLOAD_ADDITIONAL_CONTENT)
+	SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "docs" "Documentation folder" PARENT_SCOPE)
+ENDIF()