diff --git a/android/src/com/mapswithme/maps/routing/RoutingInfo.java b/android/src/com/mapswithme/maps/routing/RoutingInfo.java
index 10ff9f1424..61da83cc5f 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingInfo.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingInfo.java
@@ -47,7 +47,8 @@ public class RoutingInfo
     TURN_SHARP_LEFT(R.drawable.ic_sharp_right_light, R.drawable.ic_sharp_right_then),
     TURN_SLIGHT_LEFT(R.drawable.ic_slight_right_light, R.drawable.ic_slight_right_then),
 
-    U_TURN(R.drawable.ic_uturn_light, R.drawable.ic_uturn_then),
+    U_TURN_LEFT(R.drawable.ic_uturn_light, R.drawable.ic_uturn_then),
+    U_TURN_RIGHT(R.drawable.ic_uturn_light, R.drawable.ic_uturn_then),
     TAKE_THE_EXIT(R.drawable.ic_finish_point_light, 0),
 
     ENTER_ROUND_ABOUT(R.drawable.ic_round_light, R.drawable.ic_round_then),
diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp
index 253c48757c..8bd59eb4ec 100644
--- a/routing/turns_generator.cpp
+++ b/routing/turns_generator.cpp
@@ -543,7 +543,7 @@ LoadedPathSegment::LoadedPathSegment(RoutingMapping & mapping, Index const & ind
   , m_weight(0)
   , m_nodeId(osrmPathSegment.node)
 {
-  ASSERT(isStartNode || isEndNode, ("This function process only side cases."));
+  ASSERT(isStartNode || isEndNode, ("This function process only corner cases."));
   if (!startGraphNode.segment.IsValid() || !endGraphNode.segment.IsValid())
     return;
   buffer_vector<TSeg, 8> buffer;
@@ -581,13 +581,13 @@ LoadedPathSegment::LoadedPathSegment(RoutingMapping & mapping, Index const & ind
   {
     PhantomNode const * node = nullptr;
     if (isStartNode)
-        node = &startGraphNode.node;
-    else if (isEndNode)
-        node = &endGraphNode.node;
+      node = &startGraphNode.node;
+    if (isEndNode)
+      node = &endGraphNode.node;
     if (node)
     {
-        m_weight = (osrmPathSegment.node == node->forward_weight)
-                     ? node->GetForwardWeightPlusOffset() : node->GetReverseWeightPlusOffset();
+      m_weight = (osrmPathSegment.node == node->forward_weight)
+                  ? node->GetForwardWeightPlusOffset() : node->GetReverseWeightPlusOffset();
     }
   }
 
@@ -909,7 +909,7 @@ size_t CheckUTurnOnRoute(vector<LoadedPathSegment> const & segments, size_t curr
   // Roundabout is not the UTurn.
   if (masterSegment.m_onRoundabout)
     return 0;
-  for (size_t i = 0; i < min(kUTurnLookAhead, segments.size() - currentSegment); ++i)
+  for (size_t i = 0; i < kUTurnLookAhead && i + currentSegment < segments.size(); ++i)
   {
     auto const & checkedSegment = segments[currentSegment + i];
     if (checkedSegment.m_name == masterSegment.m_name &&
@@ -925,7 +925,7 @@ size_t CheckUTurnOnRoute(vector<LoadedPathSegment> const & segments, size_t curr
       {
         // TODO Fix direction calculation.
         // Warning! We can not determine UTurn direction in single edge case. So we use UTurnLeft.
-        // We deside to add driving rules (left-right sided driving) to mwm header.
+        // We decided to add driving rules (left-right sided driving) to mwm header.
         if (p1 == p2)
         {
           turn.m_turn = TurnDirection::UTurnLeft;
diff --git a/routing/turns_generator.hpp b/routing/turns_generator.hpp
index 3058bfbb9d..a7725f04ca 100644
--- a/routing/turns_generator.hpp
+++ b/routing/turns_generator.hpp
@@ -51,7 +51,6 @@ struct LoadedPathSegment
   LoadedPathSegment(RoutingMapping & mapping, Index const & index,
                     RawPathData const & osrmPathSegment, FeatureGraphNode const & startGraphNode,
                     FeatureGraphNode const & endGraphNode, bool isStartNode, bool isEndNode);
-  LoadedPathSegment() = delete;
 
 private:
   // Load information about road, that described as the sequence of FtSegs and start/end indexes in