diff --git a/ground/openpilotgcs/src/plugins/config/configahrswidget.h b/ground/openpilotgcs/src/plugins/config/configahrswidget.h
index 263b2586e..8cfaf041e 100644
--- a/ground/openpilotgcs/src/plugins/config/configahrswidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configahrswidget.h
@@ -135,7 +135,7 @@ private slots:
     void savePositionData();
     void computeScaleBias();
     void multiPointCalibrationMode();
-    void sixPointCalibrationMode();
+//    void sixPointCalibrationMode();      // this function no longer exists
     void attitudeRawUpdated(UAVObject * obj);
     void accelBiasattitudeRawUpdated(UAVObject*);
     void driftCalibrationAttitudeRawUpdated(UAVObject*);
diff --git a/ground/openpilotgcs/src/plugins/config/twostep.cpp b/ground/openpilotgcs/src/plugins/config/twostep.cpp
index 865f64260..fa9e95f58 100644
--- a/ground/openpilotgcs/src/plugins/config/twostep.cpp
+++ b/ground/openpilotgcs/src/plugins/config/twostep.cpp
@@ -39,6 +39,16 @@
 #include <iostream>
 #include <iomanip>
 
+#if defined(__APPLE__) || defined(_WIN32)
+  // Qt bug work around
+  #ifndef isnan
+	extern "C" int isnan(double);
+  #endif
+  #ifndef isinf
+	extern "C" int isinf(double);
+  #endif
+#endif
+
 /*
  * Alas, this implementation is a fairly direct copy of the contents of the
  * following papers.  You don't have a chance at understanding it without