diff --git a/src/uas/UASWaypointManager.cc b/src/uas/UASWaypointManager.cc
index 6b44b3d..d6bdb29 100644
--- a/src/uas/UASWaypointManager.cc
+++ b/src/uas/UASWaypointManager.cc
@@ -38,7 +38,7 @@ This file is part of the QGROUNDCONTROL project
 #define PROTOCOL_TIMEOUT_MS 2000    ///< maximum time to wait for pending messages until timeout
 #define PROTOCOL_DELAY_MS 20        ///< minimum delay between sent messages
 #define PROTOCOL_MAX_RETRIES 5      ///< maximum number of send retries (after timeout)
-
+const float UASWaypointManager::defaultAltitudeHomeOffset   = 30.0f;
 UASWaypointManager::UASWaypointManager(UAS* _uas)
     : uas(_uas),
       current_retries(0),
diff --git a/src/uas/UASWaypointManager.h b/src/uas/UASWaypointManager.h
index f0a5566..296f477 100644
--- a/src/uas/UASWaypointManager.h
+++ b/src/uas/UASWaypointManager.h
@@ -180,7 +180,7 @@ private:
     quint16 uasid;
 
     // XXX export to settings
-    static const float defaultAltitudeHomeOffset   = 30.0f;    ///< Altitude offset in meters from home for new waypoints
+    static const float defaultAltitudeHomeOffset;    ///< Altitude offset in meters from home for new waypoints
 };
 
 #endif // UASWAYPOINTMANAGER_H
diff --git a/src/ui/map/QGCMapWidget.cc b/src/ui/map/QGCMapWidget.cc
index e9df9cc..d52994a 100644
--- a/src/ui/map/QGCMapWidget.cc
+++ b/src/ui/map/QGCMapWidget.cc
@@ -212,7 +212,11 @@ void QGCMapWidget::loadSettings(bool changePosition)
     if (trailType == mapcontrol::UAVTrailType::ByDistance)
     {
         // XXX
+#ifdef Q_OS_WIN
+#pragma message ("WARNING: Settings loading for trail type not implemented")
+#else
 #warning Settings loading for trail type not implemented
+#endif
     }
     else if (trailType == mapcontrol::UAVTrailType::ByTimeElapsed)
     {