diff --git a/src/comm/XbeeLink.h b/src/comm/XbeeLink.h
index 52ff65706ef28a260a5b01823fa64957a2f42435..4159cf959388b8636f46dfd4c3280eaac56f2c0b 100644
--- a/src/comm/XbeeLink.h
+++ b/src/comm/XbeeLink.h
@@ -20,9 +20,9 @@ public:
 	~XbeeLink();
 	
 public: // virtual functions from XbeeLinkInterface
-	QString getPortName();
+	QString getPortName() const;
 	void requestReset() { }
-	int getBaudRate();
+	int getBaudRate() const;
 
 public slots: // virtual functions from XbeeLinkInterface
 	bool setPortName(QString portName);
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 23893f5269931a21bdc449420478804da2007052..354c73b4b1d9bd2931bb3b0fb1554d73bfeccdf4 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -719,7 +719,7 @@ void MainWindow::buildCommonWidgets()
 #endif
 
 #if (defined _MSC_VER) /*| (defined Q_OS_MAC) mac os doesn't support gearth right now */
-    if (!gEarthWidget)
+    if (!earthWidget)
     {
         earthWidget = new QGCGoogleEarthView(this);
         addToCentralStackedWidget(earthWidget,VIEW_GOOGLEEARTH, tr("Google Earth"));