diff --git a/CMakeLists.txt b/CMakeLists.txt
index 186d30286..5c1616769 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,7 @@ configure_file(
 option(STATIC_MKL      "Statically link MKL libraries"   OFF)
 option(DISABLE_BLADERF "Disable BladeRF"                 OFF)
 option(RPATH           "Enable RPATH"                    OFF)
+option(ENABLE_GUI      "Enable GUI"                      ON)
 
 set(GCC_ARCH native CACHE STRING "GCC compile for specific architecture.")
 
@@ -143,12 +144,12 @@ endif(VOLK_FOUND)
 
 
 if(ENABLE_GUI)
-    find_package(SRSGUI)
-    if(SRSGUI_FOUND)
-        add_definitions(-DENABLE_GUI)
-        include_directories(${SRSGUI_INCLUDE_DIRS})
-        link_directories(${SRSGUI_LIBRARY_DIRS})
-    endif(SRSGUI_FOUND)
+  find_package(SRSGUI)
+  if(SRSGUI_FOUND)
+    add_definitions(-DENABLE_GUI)
+    include_directories(${SRSGUI_INCLUDE_DIRS})
+    link_directories(${SRSGUI_LIBRARY_DIRS})
+  endif(SRSGUI_FOUND)
 endif(ENABLE_GUI)
 
 
diff --git a/srsue/src/phy/CMakeLists.txt b/srsue/src/phy/CMakeLists.txt
index 5613677ef..590b51411 100644
--- a/srsue/src/phy/CMakeLists.txt
+++ b/srsue/src/phy/CMakeLists.txt
@@ -23,5 +23,5 @@ add_library(srsue_phy ${SOURCES})
 target_link_libraries(srsue_phy ${SRSLTE_PHY_LIBRARY})
 
 if(ENABLE_GUI AND SRSGUI_FOUND)
-    target_link_libraries(srsue_phy ${SRSGUI_LIBRARIES})
+  target_link_libraries(srsue_phy ${SRSGUI_LIBRARIES})
 endif(ENABLE_GUI AND SRSGUI_FOUND)
diff --git a/srsue/src/phy/phch_worker.cc b/srsue/src/phy/phch_worker.cc
index 5f842c0f9..38b22b74e 100644
--- a/srsue/src/phy/phch_worker.cc
+++ b/srsue/src/phy/phch_worker.cc
@@ -287,7 +287,7 @@ void phch_worker::work_imp()
   
   /* Tell the plotting thread to draw the plots */
 #ifdef ENABLE_GUI
-  if (get_id() == plot_worker_id) {
+  if ((int) get_id() == plot_worker_id) {
     sem_post(&plot_sem);    
   }
 #endif