diff --git a/drape/debug_rect_renderer.cpp b/drape/debug_rect_renderer.cpp
index e79dbabe8c..e4043ccb48 100644
--- a/drape/debug_rect_renderer.cpp
+++ b/drape/debug_rect_renderer.cpp
@@ -83,7 +83,7 @@ void DebugRectRenderer::SetEnabled(bool enabled)
   m_isEnabled = enabled;
 }
 
-void DebugRectRenderer::DrawRect(ScreenBase const & screen, m2::RectF const & rect)
+void DebugRectRenderer::DrawRect(ScreenBase const & screen, m2::RectF const & rect) const
 {
   if (!m_isEnabled)
     return;
diff --git a/drape/debug_rect_renderer.hpp b/drape/debug_rect_renderer.hpp
index 2232995831..0d769da17e 100644
--- a/drape/debug_rect_renderer.hpp
+++ b/drape/debug_rect_renderer.hpp
@@ -21,7 +21,7 @@ public:
   bool IsEnabled() const;
   void SetEnabled(bool enabled);
 
-  void DrawRect(ScreenBase const & screen, m2::RectF const & rect);
+  void DrawRect(ScreenBase const & screen, m2::RectF const & rect) const;
 
 private:
   DebugRectRenderer();
diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp
index c1825d28e5..b02401d7c5 100644
--- a/drape/render_bucket.cpp
+++ b/drape/render_bucket.cpp
@@ -102,7 +102,7 @@ void RenderBucket::Render(ScreenBase const & screen)
   m_buffer->Render();
 }
 
-void RenderBucket::RenderDebug(ScreenBase const & screen)
+void RenderBucket::RenderDebug(ScreenBase const & screen) const
 {
 #ifdef RENDER_DEBUG_RECTS
   if (!m_overlay.empty())
diff --git a/drape/render_bucket.hpp b/drape/render_bucket.hpp
index 4509e5acab..357ed5c200 100644
--- a/drape/render_bucket.hpp
+++ b/drape/render_bucket.hpp
@@ -30,7 +30,7 @@ public:
   void Render(ScreenBase const & screen);
 
   // Only for testing! Don't use this function in production code!
-  void RenderDebug(ScreenBase const & screen);
+  void RenderDebug(ScreenBase const & screen) const;
 
   // Only for testing! Don't use this function in production code!
   template <typename ToDo>
diff --git a/drape_frontend/render_group.cpp b/drape_frontend/render_group.cpp
index a268295ce4..8d44957254 100755
--- a/drape_frontend/render_group.cpp
+++ b/drape_frontend/render_group.cpp
@@ -76,17 +76,17 @@ void RenderGroup::Render(ScreenBase const & screen)
     m_uniforms.SetFloatValue("u_isOutlinePass", 1.0f);
     dp::ApplyUniforms(m_uniforms, m_shader);
 
-    for(drape_ptr<dp::RenderBucket> & renderBucket : m_renderBuckets)
+    for(auto & renderBucket : m_renderBuckets)
       renderBucket->Render(screen);
 
     m_uniforms.SetFloatValue("u_contrastGamma", params.m_contrast, params.m_gamma);
     m_uniforms.SetFloatValue("u_isOutlinePass", 0.0f);
     dp::ApplyUniforms(m_uniforms, m_shader);
-    for(drape_ptr<dp::RenderBucket> & renderBucket : m_renderBuckets)
+    for(auto & renderBucket : m_renderBuckets)
       renderBucket->Render(screen);
 
 #ifdef RENDER_DEBUG_RECTS
-    for(drape_ptr<dp::RenderBucket> & renderBucket : m_renderBuckets)
+    for(auto const & renderBucket : m_renderBuckets)
       renderBucket->RenderDebug(screen);
 #endif
   }