diff --git a/GUI/coregui/CMakeLists.txt b/GUI/coregui/CMakeLists.txt
index fbb9ca900cc5616912fad4390d24bf8750ebc79f..2082cb2a1b4b3a6ce20b34a5293ea630559c9ac8 100644
--- a/GUI/coregui/CMakeLists.txt
+++ b/GUI/coregui/CMakeLists.txt
@@ -105,6 +105,7 @@ include_directories(
     ${qcustomplot_INCLUDE_DIRS}
     ${qtpropertybrowser_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
+    ${GSL_INCLUDE_DIR}
     ${BornAgainCore_INCLUDE_DIRS}
     ${BornAgainFit_INCLUDE_DIRS}
     ${ManhattanStyle_INCLUDE_DIRS}
diff --git a/GUI/coregui/Models/JobQueueModel.cpp b/GUI/coregui/Models/JobQueueModel.cpp
index 50935d5381ed71356defbfae97d55470c91039df..02cbaa8512a030b06ae0d9f4e7a65f4714b92def 100644
--- a/GUI/coregui/Models/JobQueueModel.cpp
+++ b/GUI/coregui/Models/JobQueueModel.cpp
@@ -289,7 +289,7 @@ void JobQueueModel::readFrom(QXmlStreamReader *reader)
 void JobQueueModel::onSelectionChanged( const QItemSelection &selected, const QItemSelection & /*deselected*/)
 {
     qDebug() << "JobQueueModel::onSelectionChanged" << selected;
-    if(!selected.empty() and !selected.first().indexes().empty()) {
+    if(!selected.empty() &&  !selected.first().indexes().empty()) {
         QModelIndex index = selected.first().indexes().at(0);
         emit selectionChanged(getJobItemForIndex(index));
     }
diff --git a/GUI/externals/qtpropertybrowser/CMakeLists.txt b/GUI/externals/qtpropertybrowser/CMakeLists.txt
index 99677199e04e5777c937ee59f4a967e4fd665e9e..1fe061812c31841709850bb0bb03fc80d3634c60 100644
--- a/GUI/externals/qtpropertybrowser/CMakeLists.txt
+++ b/GUI/externals/qtpropertybrowser/CMakeLists.txt
@@ -19,8 +19,7 @@ set(include_dirs
 
 include_directories(${include_dirs})
 
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
 
 set(resource_files
     "qtpropertybrowser.qrc"
diff --git a/GUI/main/CMakeLists.txt b/GUI/main/CMakeLists.txt
index 82e6fa21e1574690337b8792d7c5fcca3ab2fd47..734b65b097e1c490e6c83e11304b404c6542b367 100644
--- a/GUI/main/CMakeLists.txt
+++ b/GUI/main/CMakeLists.txt
@@ -14,6 +14,7 @@ set(executable_name BornAgain)
 include_directories(
     ${BornAgainGUI_INCLUDE_DIRS}
     ${ManhattanStyle_INCLUDE_DIRS}
+    ${GSL_INCLUDE_DIR}
 )
 
 add_executable(${executable_name} main.cpp)
diff --git a/Tests/UnitTests/TestGUI/CMakeLists.txt b/Tests/UnitTests/TestGUI/CMakeLists.txt
index a82a948d773f7829df27c6a98b77c9bfae80fa69..f50067d6141b02e28138e4f9ad7b24158fac68f3 100644
--- a/Tests/UnitTests/TestGUI/CMakeLists.txt
+++ b/Tests/UnitTests/TestGUI/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
     ${BornAgainCore_INCLUDE_DIRS}
     ${EIGEN3_INCLUDE_DIR}
-#    ${GSL_INCLUDE_DIR}
+    ${GSL_INCLUDE_DIR}
     ${BornAgainGUI_INCLUDE_DIRS}
     ${BornAgainFit_INCLUDE_DIRS}
 )