diff --git a/drape/render_bucket.hpp b/drape/render_bucket.hpp
index cbd30ac49d..c3044d0234 100644
--- a/drape/render_bucket.hpp
+++ b/drape/render_bucket.hpp
@@ -23,7 +23,7 @@ public:
 
   void Update(ScreenBase const & modelView);
   void CollectOverlayHandles(RefPointer<OverlayTree> tree);
-  void Render(const ScreenBase & screen);
+  void Render(ScreenBase const & screen);
 
 private:
   vector<MasterPointer<OverlayHandle> > m_overlay;
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index 7bf347f04e..9129b66d73 100644
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -323,9 +323,6 @@ void FrontendRenderer::ThreadMain()
     context->setDefaultFramebuffer();
     RenderScene();
 
-    //double avarageMessageTime = processingTime;
-    //processingTime = timer.ElapsedSeconds();
-    //int messageCount = 0;
     double availableTime = VSyncInterval - (timer.ElapsedSeconds() /*+ avarageMessageTime*/);
 
     if (availableTime < 0.0)
diff --git a/drape_frontend/render_group.hpp b/drape_frontend/render_group.hpp
index 9c0c2e6778..f7d3ee51ad 100644
--- a/drape_frontend/render_group.hpp
+++ b/drape_frontend/render_group.hpp
@@ -23,7 +23,7 @@ public:
 
   void Update(ScreenBase const & modelView);
   void CollectOverlay(dp::RefPointer<dp::OverlayTree> tree);
-  void Render(const ScreenBase & screen);
+  void Render(ScreenBase const & screen);
 
   void PrepareForAdd(size_t countForAdd);
   void AddBucket(dp::TransferPointer<dp::RenderBucket> bucket);
diff --git a/drape_frontend/text_layout.cpp b/drape_frontend/text_layout.cpp
index 4c1f0296cd..837cf9ea62 100644
--- a/drape_frontend/text_layout.cpp
+++ b/drape_frontend/text_layout.cpp
@@ -145,7 +145,7 @@ dp::OverlayHandle * TextLayout::LayoutText(const FeatureID & featureID,
   m2::PointU size;
   region.GetPixelSize(size);
   double const w = size.x * m_textSizeRatio;
-  glyphOffset += w/2.0f;
+  glyphOffset += w / 2.0f;
 
   return new StraightTextHandle(featureID, pivot, m2::PointD(glyphOffset, maxHeight),
                                 m2::PointF(pixelOffset.x, pixelOffset.y + minHeight), depth);
diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp
index f004ed43ba..1d11a06c9c 100644
--- a/drape_head/testing_engine.cpp
+++ b/drape_head/testing_engine.cpp
@@ -451,8 +451,8 @@ void TestingEngine::DrawImpl()
     LOG(LCRITICAL, (e.Msg()));
   }
 
-  //for (size_t i = 0; i < shapes.size(); ++i)
-    shapes[1]->Draw(m_batcher.GetRefPointer(), m_textures.GetRefPointer());
+  for (size_t i = 0; i < shapes.size(); ++i)
+    shapes[i]->Draw(m_batcher.GetRefPointer(), m_textures.GetRefPointer());
 
   DeleteRange(shapes, DeleteFunctor());