diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt
index ec1968c31..9bfe678f5 100755
--- a/slsDetectorGui/CMakeLists.txt
+++ b/slsDetectorGui/CMakeLists.txt
@@ -91,7 +91,6 @@ target_link_libraries(slsDetectorGui PUBLIC
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTGUI_LIBRARIES}
     ${QWT_LIBRARIES}
-    pthread
     ${ZeroMQ_LIBRARIES}
     rt
     png
@@ -104,3 +103,4 @@ set_target_properties(slsDetectorGui PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 )
 
+install(TARGETS slsDetectorGui DESTINATION bin)
diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h
index dbf937715..7df80fbdd 100755
--- a/slsDetectorGui/include/qDefs.h
+++ b/slsDetectorGui/include/qDefs.h
@@ -26,9 +26,9 @@ class qDefs : public QWidget {
     static void DisplayExceptions(std::string emsg, std::string src) {
         try {
             throw;
-        } catch (sls::SocketError) {
+        } catch (const sls::SocketError &e) {
             throw;
-        } catch (sls::SharedMemoryError) {
+        } catch (const sls::SharedMemoryError &e) {
             throw;
         } catch (const std::exception &e) {
             ExceptionMessage(emsg, e.what(), src);
@@ -42,9 +42,9 @@ class qDefs : public QWidget {
                                  typename NonDeduced<CT>::type... Args) {
         try {
             throw;
-        } catch (sls::SocketError) {
+        } catch (const sls::SocketError &e) {
             throw;
-        } catch (sls::SharedMemoryError) {
+        } catch (const sls::SharedMemoryError &e) {
             throw;
         } catch (const std::exception &e) {
             ExceptionMessage(emsg, e.what(), src);
diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp
index 12a6d74e0..038da0f4f 100755
--- a/slsDetectorGui/src/qDetectorMain.cpp
+++ b/slsDetectorGui/src/qDetectorMain.cpp
@@ -252,6 +252,7 @@ void qDetectorMain::SetUpDetector(const std::string fName, int multiID) {
     case slsDetectorDefs::JUNGFRAU:
         actionLoadTrimbits->setText("Load Settings");
         actionSaveTrimbits->setText("Save Settings");
+        break;
     case slsDetectorDefs::MOENCH:
         actionLoadTrimbits->setEnabled(false);
         actionSaveTrimbits->setEnabled(false);
diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp
index 409910218..f3f2db572 100755
--- a/slsDetectorGui/src/qTabAdvanced.cpp
+++ b/slsDetectorGui/src/qTabAdvanced.cpp
@@ -156,6 +156,7 @@ void qTabAdvanced::GetOnline() {
             lblOnline->setToolTip(detOnlineTip);
             dispOnline->setPalette(lblHostname->palette());
             lblOnline->setPalette(lblHostname->palette());
+            break;
         default:
             dispOnline->setText("Offline");
             lblOnline->setText("Detector Online Status:* ");
@@ -291,6 +292,7 @@ void qTabAdvanced::GetReceiverOnline() {
             lblRxrOnline->setToolTip(rxrOnlineTip);
             dispRxrOnline->setPalette(lblHostname->palette());
             lblRxrOnline->setPalette(lblHostname->palette());
+            break;
         default:
             dispRxrOnline->setText("Offline");
             lblRxrOnline->setText("Receiver Online Status:* ");
diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp
index 5006ff86e..69296decc 100755
--- a/slsDetectorGui/src/qTabMeasurement.cpp
+++ b/slsDetectorGui/src/qTabMeasurement.cpp
@@ -7,6 +7,7 @@
 #include <QStandardItemModel>
 #include <QTimer>
 
+#include <cmath>
 #include <iostream>
 
 qTabMeasurement::qTabMeasurement(QWidget *parent, multiSlsDetector *detector, qDrawPlot *plot) : QWidget(parent), myDet(detector), myPlot(plot),
diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_gui b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_gui
index a3a451907..afdc74bfd 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_gui and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_gui differ
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
index d08f8dabc..e4348e180 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
@@ -121,7 +121,6 @@ const char* getTimerName(enum timerIndex ind) {
     case ACTUAL_TIME:               return "actual_time";
     case MEASUREMENT_TIME:          return "measurement_time";
     case PROGRESS:                  return "progress";
-    case MEASUREMENTS_NUMBER:       return "measurements_number";
     case FRAMES_FROM_START:         return "frames_from_start";
     case FRAMES_FROM_START_PG:      return "frames_from_start_pg";
     case ANALOG_SAMPLES:            return "analog_samples";
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index 74a548755..d762c7d93 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -5,6 +5,6 @@
 #define APIRECEIVER 0x190604
 #define APIGUI 0x190405
 #define APICTB 0x190604
-#define APIEIGER 0x190604
 #define APIJUNGFRAU 0x190604
-#define APIGOTTHARD 0x190604
\ No newline at end of file
+#define APIGOTTHARD 0x190604
+#define APIEIGER 0x190702