diff --git a/CMakeLists.txt b/CMakeLists.txt
index d483f9227..83375e97c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,7 @@ OPTION(WITH_BLACK_LIB                 "Build BlackBox libraries"
 IF(WITH_BLACK_LIB)
 	OPTION(WITH_BLACK_CORE                "Build Core library"                           ON )
 	OPTION(WITH_BLACK_MISC                "Build Misc library"                           ON )
-	IF(WIN32)
-		OPTION(WITH_STATIC            	"With static libraries."                        ON )
-	ELSE(WIN32)
-		OPTION(WITH_STATIC            	"With static libraries."                        OFF)
-	ENDIF()
+	OPTION(WITH_STATIC            	"With static libraries."                        ON )
 	OPTION(WITH_BLACK_SAMPLES			"With BlackLib Samples."						ON)
 ENDIF(WITH_BLACK_LIB)
 
@@ -169,6 +165,10 @@ IF(MSVC)
 	ENDIF(MSVC11)
 
 	ADD_COMPILER_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /Zm1000 /wd4250")
+	
+	ADD_DEFINITIONS(
+      /Zc:wchar_t-                                # Treat wchar_t as built-in type
+	)
 ENDIF()
 
 ############### Configure checks ###############
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 4ec2bec48..2e087986a 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -1,6 +1,6 @@
-ADD_SUBDIRECTORY(Logging)
+ADD_SUBDIRECTORY(logging)
 ADD_SUBDIRECTORY(com_server)
 ADD_SUBDIRECTORY(com_client)
-ADD_SUBDIRECTORY(Geodetic2Ecef)
+ADD_SUBDIRECTORY(geodetic2ecef)
 ADD_SUBDIRECTORY(interpolator)
 ADD_SUBDIRECTORY(config)
\ No newline at end of file
diff --git a/samples/geodetic2ecef/CMakeLists.txt b/samples/geodetic2ecef/CMakeLists.txt
index b3afc69b1..0b3848fa2 100644
--- a/samples/geodetic2ecef/CMakeLists.txt
+++ b/samples/geodetic2ecef/CMakeLists.txt
@@ -1,6 +1,6 @@
 FILE(GLOB SRC *.cpp)
 
-ADD_EXECUTABLE(sample_Geodetic2Ecef ${SRC})
+ADD_EXECUTABLE(sample_geodetic2ecef ${SRC})
 
-TARGET_LINK_LIBRARIES(sample_Geodetic2Ecef blackmisc blackcore ${QT_LIBRARIES})
-SET_TARGET_PROPERTIES(sample_Geodetic2Ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef")
\ No newline at end of file
+TARGET_LINK_LIBRARIES(sample_geodetic2ecef blackmisc blackcore ${QT_LIBRARIES})
+SET_TARGET_PROPERTIES(sample_geodetic2ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef")
\ No newline at end of file
diff --git a/src/blackcore/CMakeLists.txt b/src/blackcore/CMakeLists.txt
index 13c37653c..2a5762087 100644
--- a/src/blackcore/CMakeLists.txt
+++ b/src/blackcore/CMakeLists.txt
@@ -2,6 +2,8 @@ FILE(GLOB blackcore_SOURCES *.cpp)
 FILE(GLOB blackcore_HEADERS *.h)
 SET(blackcore_HEADERS_QOBJECT 
 			fsd_client.h)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 		
 QT4_WRAP_CPP(blackcore_HEADERS_MOC ${blackcore_HEADERS_QOBJECT})
 
diff --git a/src/blackd/blackd.pro b/src/blackd/blackd.pro
index ba82d8a15..74ccf1a20 100644
--- a/src/blackd/blackd.pro
+++ b/src/blackd/blackd.pro
@@ -2,6 +2,7 @@ QT       += core gui xml svg network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+
 TARGET = blackd
 TEMPLATE = app
 
diff --git a/src/blackmisc/display.cpp b/src/blackmisc/display.cpp
index ab1612b52..5dbc285e3 100644
--- a/src/blackmisc/display.cpp
+++ b/src/blackmisc/display.cpp
@@ -9,9 +9,7 @@
 #include "blackmisc/context.h"
 #include "blackmisc/display.h"
 
-#ifdef Q_OS_LINUX
-    #include <errno.h>
-#endif
+#include <errno.h>
 
 namespace BlackMisc
 {