diff --git a/drape/batcher.cpp b/drape/batcher.cpp
index a6ea7d49b9..48726f2403 100644
--- a/drape/batcher.cpp
+++ b/drape/batcher.cpp
@@ -43,7 +43,7 @@ public:
   uint16_t * GetIndexStorage(uint16_t size, uint16_t & startIndex)
   {
     startIndex = m_buffer->GetStartIndexValue();
-    if (m_overlay.IsNull() || !m_overlay->RequiresIndexes())
+    if (m_overlay.IsNull() || !m_overlay->IndexesRequired())
     {
       m_indexStorage.resize(size);
       return &m_indexStorage[0];
@@ -54,7 +54,7 @@ public:
 
   void SubmitIndexes()
   {
-    if (m_overlay.IsNull() || !m_overlay->RequiresIndexes())
+    if (m_overlay.IsNull() || !m_overlay->IndexesRequired())
       m_buffer->UploadIndexes(&m_indexStorage[0], m_indexStorage.size());
   }
 
diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp
index 1cf6a78342..142472ff1c 100644
--- a/drape/overlay_handle.hpp
+++ b/drape/overlay_handle.hpp
@@ -39,7 +39,7 @@ public:
 
   bool IsIntersect(ScreenBase const & screen, OverlayHandle const & h) const;
 
-  virtual bool RequiresIndexes() const { return true; }
+  virtual bool IndexesRequired() const { return true; }
   uint16_t * IndexStorage(uint16_t size);
   void GetElementIndexes(RefPointer<IndexBufferMutator> mutator) const;
   virtual void GetAttributeMutation(RefPointer<AttributeBufferMutator> mutator, ScreenBase const & screen) const;
diff --git a/drape_gui/compass.cpp b/drape_gui/compass.cpp
index cd2f7afb9c..7a9636fe6c 100644
--- a/drape_gui/compass.cpp
+++ b/drape_gui/compass.cpp
@@ -45,7 +45,7 @@ namespace
       }
     }
 
-    virtual bool RequiresIndexes() const override { return false; }
+    virtual bool IndexesRequired() const override { return false; }
 
     virtual m2::RectD GetPixelRect(ScreenBase const & screen) const override
     {
diff --git a/drape_gui/shape.cpp b/drape_gui/shape.cpp
index 95b39582ff..796a50f77c 100644
--- a/drape_gui/shape.cpp
+++ b/drape_gui/shape.cpp
@@ -34,7 +34,7 @@ void ShapeRenderer::Render(ScreenBase const & screen, dp::RefPointer<dp::GpuProg
 {
   Handle * handle = static_cast<Handle *>(m_implHandle.GetRaw());
   handle->Update(screen);
-  if (!(handle->IsVisible() && handle->IsValid()))
+  if (!(handle->IsValid() && handle->IsVisible()))
     return;
 
   dp::RefPointer<dp::GpuProgram> prg = mng->GetProgram(m_state.GetProgramIndex());
diff --git a/drape_gui/skin.hpp b/drape_gui/skin.hpp
index c27f518469..a72c1da35f 100644
--- a/drape_gui/skin.hpp
+++ b/drape_gui/skin.hpp
@@ -46,7 +46,7 @@ public:
     Copyright
   };
 
-  explicit Skin(ReaderPtr<Reader> const & reader, double visualScale);
+  Skin(ReaderPtr<Reader> const & reader, double visualScale);
 
   Position ResolvePosition(ElementName name);
   void Resize(int w, int h);