diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43660fe2..c198b1b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -525,10 +525,12 @@ configure_file(
 
 #configure the versioning file
 configure_file(
-	${CMAKE_SOURCE_DIR}/cmake/version.h.in
-	${CMAKE_BINARY_DIR}/src/lib_gui/version.h
+	${CMAKE_SOURCE_DIR}/cmake/productVersion.h.in
+	${CMAKE_BINARY_DIR}/src/lib_gui/productVersion.h
 )
 
+set_property(SOURCE ${CMAKE_BINARY_DIR}/src/lib_gui/productVersion.h PROPERTY SKIP_AUTOMOC ON)
+
 set(CMAKE_AUTOMOC OFF)
 
 
diff --git a/cmake/version.cmake b/cmake/version.cmake
index c66f82a2..4a5752e5 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -48,8 +48,3 @@ message(STATUS "Version year: ${VERSION_YEAR}")
 message(STATUS "Version minor: ${VERSION_MINOR}")
 message(STATUS "Version commit: ${VERSION_COMMIT}")
 message(STATUS "Git commit time: ${GIT_COMMIT_TIME}")
-
-configure_file(
-  ${CMAKE_SOURCE_DIR}/cmake/productVersion.h.in
-  ${BINARY_DIR}/src/lib_gui/productVersion.h
-)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index a6e4cf23..a4e2cfaf 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -647,10 +647,17 @@ add_files(
 	utility/utilityLibrary.h
 	utility/utilityUuid.cpp
 	utility/utilityUuid.h
-	utility/utilityWindows.cpp
-	utility/utilityWindows.h
 	utility/utilityXml.cpp
 	utility/utilityXml.h
 	utility/Version.cpp
 	utility/Version.h
 )
+
+if (WIN32)
+	add_files(
+		LIB
+
+		utility/utilityWindows.cpp
+		utility/utilityWindows.h
+	)
+endif()
diff --git a/src/lib_gui/qt/element/QtStatusBar.cpp b/src/lib_gui/qt/element/QtStatusBar.cpp
index 860532df..1b8fd138 100644
--- a/src/lib_gui/qt/element/QtStatusBar.cpp
+++ b/src/lib_gui/qt/element/QtStatusBar.cpp
@@ -104,7 +104,7 @@ void QtStatusBar::setText(const std::wstring& text, bool isError, bool showLoade
 	}
 	else
 	{
-		m_text.setStyleSheet("QPushButton { color: #000000; margin-right: 0; spacing: none; text-align: left; }");
+		m_text.setStyleSheet("QPushButton { margin-right: 0; spacing: none; text-align: left; }");
 	}
 
 	if (showLoader)
@@ -137,7 +137,7 @@ void QtStatusBar::setErrorCount(ErrorCountInfo errorCount)
 		}
 		else
 		{
-			m_errorButton.setStyleSheet("QPushButton { color: #000000; margin-right: 0; spacing: none; }");
+			m_errorButton.setStyleSheet("QPushButton { margin-right: 0; spacing: none; }");
 		}
 
 		m_errorButton.show();