diff --git a/drape/drape_tests/batcher_tests.cpp b/drape/drape_tests/batcher_tests.cpp
index 8dd30cbd61..6d7b9a2415 100644
--- a/drape/drape_tests/batcher_tests.cpp
+++ b/drape/drape_tests/batcher_tests.cpp
@@ -143,13 +143,10 @@ UNIT_TEST(BatchLists_Test)
     EXPECTGL(glEnableVertexAttribute(1));
     EXPECTGL(glVertexAttributePointer(1, 3, gl_const::GLFloatType, false, 0, 0));
 
-    // bind index buffer
-    EXPECTGL(glBindBuffer(IndexBufferID, gl_const::GLElementArrayBuffer));
-
     // delete bucket
-    EXPECTGL(glDeleteBuffer(IndexBufferID));
-    EXPECTGL(glDeleteBuffer(DataBufferID));
-    EXPECTGL(glDeleteVertexArray(3));
+    EXPECTGL(glDeleteBuffer(_));
+    EXPECTGL(glDeleteBuffer(_));
+    EXPECTGL(glDeleteVertexArray(VaoID));
     EXPECTGL(glUseProgram(0));
     EXPECTGL(glDeleteProgram(ProgramID));
   }
diff --git a/drape/gpu_buffer.cpp b/drape/gpu_buffer.cpp
index 3c7a658eb5..60bed54833 100644
--- a/drape/gpu_buffer.cpp
+++ b/drape/gpu_buffer.cpp
@@ -16,7 +16,6 @@ GPUBuffer::GPUBuffer(Target t, uint8_t elementSize, uint16_t capacity)
   , m_t(t)
 {
   m_bufferID = GLFunctions::glGenBuffer();
-  Bind();
   Resize(capacity);
 }
 
diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp
index 9395fc41a6..72c8c0f677 100644
--- a/drape/vertex_array_buffer.cpp
+++ b/drape/vertex_array_buffer.cpp
@@ -16,7 +16,7 @@ VertexArrayBuffer::VertexArrayBuffer(uint32_t indexBufferSize, uint32_t dataBuff
 VertexArrayBuffer::~VertexArrayBuffer()
 {
   m_indexBuffer.Destroy();
-  (void)GetRangeDeletor(m_buffers, MasterPointerDeleter())();
+  DeleteRange(m_buffers, MasterPointerDeleter());
 
   if (m_VAO != 0)
   {