diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index 93aeab6455..1b0f753654 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -171,6 +171,7 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
 }
 
 - (void)stateReady {
+  // TODO: Here assert sometimes fires with _state = MWMNavigationDashboardStateReady, if app was stopped while navigating and then restarted.
   NSAssert(_state == MWMNavigationDashboardStatePlanning, @"Invalid state change (ready)");
   [self setRouteBuilderProgress:100.];
   [self updateGoButtonTitle];
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
index ad786594f2..0176d0a579 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
@@ -14,17 +14,18 @@
 
 #include "geometry/angles.hpp"
 
-namespace {
-CGFloat const kTurnsiPhoneWidth = 96;
-CGFloat const kTurnsiPadWidth = 140;
+namespace
+{
+CGFloat constexpr kTurnsiPhoneWidth = 96;
+CGFloat constexpr kTurnsiPadWidth = 140;
 
-CGFloat const kSearchButtonsViewHeightPortrait = 200;
-CGFloat const kSearchButtonsViewWidthPortrait = 200;
-CGFloat const kSearchButtonsViewHeightLandscape = 56;
-CGFloat const kSearchButtonsViewWidthLandscape = 286;
-CGFloat const kSearchButtonsSideSize = 44;
-CGFloat const kBaseTurnsTopOffset = 28;
-CGFloat const kShiftedTurnsTopOffset = 8;
+CGFloat constexpr kSearchButtonsViewHeightPortrait = 200;
+CGFloat constexpr kSearchButtonsViewWidthPortrait = 200;
+CGFloat constexpr kSearchButtonsViewHeightLandscape = 56;
+CGFloat constexpr kSearchButtonsViewWidthLandscape = 286;
+CGFloat constexpr kSearchButtonsSideSize = 44;
+CGFloat constexpr kBaseTurnsTopOffset = 28;
+CGFloat constexpr kShiftedTurnsTopOffset = 8;
 
 NSTimeInterval constexpr kCollapseSearchTimeout = 5.0;