diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 1b0fc4cd6c..4e8751050c 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -43,7 +43,7 @@ DrawWidget::DrawWidget(Framework & framework, QWidget * parent)
 {
   m_framework.SetMapSelectionListeners(
       [this](place_page::Info const & info) { ShowPlacePage(info); },
-      [](bool /*switchFullScreenMode*/) {});  // Empty deactivation listener.
+      [](bool /* switchFullScreenMode */) {});  // Empty deactivation listener.
 
   m_framework.SetRouteBuildingListener(
       [](routing::IRouter::ResultCode, storage::TCountriesVec const &) {});
@@ -126,14 +126,16 @@ void DrawWidget::ShowAll()
 
 void DrawWidget::ChoosePositionModeEnable()
 {
-  m_framework.BlockTapEvents(true);
-  m_framework.EnableChoosePositionMode(true, false, false, m2::PointD());
+  m_framework.BlockTapEvents(true /* block */);
+  m_framework.EnableChoosePositionMode(true /* enable */, false /* enableBounds */,
+                                       false /* applyPosition */, m2::PointD() /* position */);
 }
 
 void DrawWidget::ChoosePositionModeDisable()
 {
-  m_framework.EnableChoosePositionMode(false, false, false, m2::PointD());
-  m_framework.BlockTapEvents(false);
+  m_framework.EnableChoosePositionMode(false /* enable */, false /* enableBounds */,
+                                       false /* applyPosition */, m2::PointD() /* position */);
+  m_framework.BlockTapEvents(false /* block */);
 }
 
 void DrawWidget::initializeGL()
diff --git a/qt/qt_common/map_widget.cpp b/qt/qt_common/map_widget.cpp
index 08490e2d74..8c12212681 100644
--- a/qt/qt_common/map_widget.cpp
+++ b/qt/qt_common/map_widget.cpp
@@ -153,8 +153,8 @@ df::TouchEvent MapWidget::GetTouchEvent(QMouseEvent * e, df::TouchEvent::ETouchT
 
 df::Touch MapWidget::GetSymmetrical(df::Touch const & touch) const
 {
-  m2::PointD pixelCenter = m_framework.GetPixelCenter();
-  m2::PointD symmetricalLocation = pixelCenter + (pixelCenter - touch.m_location);
+  m2::PointD const pixelCenter = m_framework.GetPixelCenter();
+  m2::PointD const symmetricalLocation = pixelCenter + (pixelCenter - touch.m_location);
 
   df::Touch result;
   result.m_id = touch.m_id + 1;
diff --git a/qt/qt_common/map_widget.hpp b/qt/qt_common/map_widget.hpp
index e4251118ec..8b35876c67 100644
--- a/qt/qt_common/map_widget.hpp
+++ b/qt/qt_common/map_widget.hpp
@@ -80,7 +80,7 @@ protected:
   drape_ptr<QtOGLContextFactory> m_contextFactory;
   std::unique_ptr<gui::Skin> m_skin;
 
-  unique_ptr<QTimer> m_updateTimer;
+  std::unique_ptr<QTimer> m_updateTimer;
 };
 }  // namespace common
 }  // namespace qt
diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt
index d7a3c78875..d6c2c1911f 100644
--- a/search/search_quality/assessment_tool/CMakeLists.txt
+++ b/search/search_quality/assessment_tool/CMakeLists.txt
@@ -18,6 +18,7 @@ omim_link_libraries(
   storage
   tracking
   traffic
+  routing_common
   indexer
   drape
   partners_api