diff --git a/platform/location_service.cpp b/platform/location_service.cpp
index 9ecd552b7c..96dee69fb1 100644
--- a/platform/location_service.cpp
+++ b/platform/location_service.cpp
@@ -84,7 +84,7 @@ namespace location
       m_services.push_back(CreateAppleLocationService(*this));
 #endif
 
-#if defined(OMIM_OS_DESKTOP)
+#if defined(OMIM_OS_MAC) || defined(OMIM_OS_WINDOWS)
       m_services.push_back(CreateWiFiLocationService(*this));
 #endif
     }
diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp
index f93a0340ed..1225433a18 100644
--- a/qt/draw_widget.hpp
+++ b/qt/draw_widget.hpp
@@ -87,7 +87,7 @@ namespace qt
 
     void PrepareShutdown();
 
-    Framework<model_t> & Framework() { return *m_framework.get(); }
+    Framework<model_t> & GetFramework() { return *m_framework.get(); }
 
   protected:
     static const uint32_t ini_file_version = 0;
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 76fe7497f7..9ba8969910 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -317,12 +317,12 @@ void MainWindow::OnLocationStatusChanged(location::TLocationStatus newStatus)
   default:
     break;
   }
-  m_pDrawWidget->Framework().OnLocationStatusChanged(newStatus);
+  m_pDrawWidget->GetFramework().OnLocationStatusChanged(newStatus);
 }
 
 void MainWindow::OnGpsUpdated(location::GpsInfo const & info)
 {
-  m_pDrawWidget->Framework().OnGpsUpdate(info);
+  m_pDrawWidget->GetFramework().OnGpsUpdate(info);
 }
 
 void MainWindow::OnMyPosition()