diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp
index 7f93726df1..0dd0dcde5b 100644
--- a/drape/overlay_tree.cpp
+++ b/drape/overlay_tree.cpp
@@ -7,9 +7,9 @@
 
 namespace dp
 {
-uint32_t const kMinFrameUpdatePeriod = 5;
-uint32_t const kAvgFrameUpdatePeriod = 10;
-uint32_t const kMaxFrameUpdatePeriod = 15;
+int const kMinFrameUpdatePeriod = 5;
+int const kAvgFrameUpdatePeriod = 10;
+int const kMaxFrameUpdatePeriod = 15;
 uint32_t const kMinHandlesCount = 100;
 uint32_t const kMaxHandlesCount = 1000;
 
diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp
index e6b8e2f981..a1138d7a47 100644
--- a/drape/render_bucket.cpp
+++ b/drape/render_bucket.cpp
@@ -58,14 +58,14 @@ void RenderBucket::AddOverlayHandle(drape_ptr<OverlayHandle> && handle)
 
 void RenderBucket::BeforeUpdate()
 {
-  for (drape_ptr<OverlayHandle> & overlayHandle : m_overlay)
+  for (auto & overlayHandle : m_overlay)
     overlayHandle->BeforeUpdate();
 }
 
 void RenderBucket::Update(ScreenBase const & modelView)
 {
   BeforeUpdate();
-  for (drape_ptr<OverlayHandle> & overlayHandle : m_overlay)
+  for (auto & overlayHandle : m_overlay)
   {
     if (overlayHandle->IsVisible())
       overlayHandle->Update(modelView);
@@ -75,7 +75,7 @@ void RenderBucket::Update(ScreenBase const & modelView)
 void RenderBucket::CollectOverlayHandles(ref_ptr<OverlayTree> tree)
 {
   BeforeUpdate();
-  for (drape_ptr<OverlayHandle> const & overlayHandle : m_overlay)
+  for (auto const & overlayHandle : m_overlay)
     tree->Add(make_ref(overlayHandle));
 }
 
@@ -86,7 +86,7 @@ bool RenderBucket::HasOverlayHandles() const
 
 void RenderBucket::RemoveOverlayHandles(ref_ptr<OverlayTree> tree)
 {
-  for (drape_ptr<OverlayHandle> const & overlayHandle : m_overlay)
+  for (auto const & overlayHandle : m_overlay)
     tree->Remove(make_ref(overlayHandle));
 }
 
diff --git a/drape_frontend/path_text_handle.cpp b/drape_frontend/path_text_handle.cpp
index f1d1033200..38f83212d5 100644
--- a/drape_frontend/path_text_handle.cpp
+++ b/drape_frontend/path_text_handle.cpp
@@ -15,7 +15,7 @@ void PathTextContext::SetLayout(drape_ptr<PathTextLayout> && layout, double base
   PathTextLayout::CalculatePositions(m_globalSpline->GetLength(), baseGtoPScale,
                                      m_layout->GetPixelLength(), m_globalOffsets);
   m_globalPivots.reserve(m_globalOffsets.size());
-  for (auto offset : m_globalOffsets)
+  for (auto const offset : m_globalOffsets)
     m_globalPivots.push_back(m_globalSpline->GetPoint(offset).m_pos);
 }
 
@@ -110,12 +110,12 @@ m2::Spline::iterator PathTextContext::GetProjectedPoint(std::vector<m2::Spline>
 
     double step = 0;
 
-    for (size_t i = 0, sz = path.size(); i < sz - 1; ++i)
+    for (size_t i = 0, sz = path.size(); i + 1 < sz; ++i)
     {
       double const segLength = spline.GetLengths()[i];
       m2::PointD const segDir = spline.GetDirections()[i];
 
-       m2::PointD v = pt - path[i];
+      m2::PointD const v = pt - path[i];
       double const t = m2::DotProduct(segDir, v);
 
       m2::PointD nearestPt;
@@ -248,7 +248,7 @@ void PathTextHandle::GetPixelShape(ScreenBase const & screen, bool perspective,
 
 void PathTextHandle::GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator> mutator) const
 {
-  // for visible text paths we always update normals
+  // We always update normals for visible text paths.
   SetForceUpdateNormals(IsVisible());
   TextHandle::GetAttributeMutation(mutator);
 }