diff --git a/src/eepp/graphics/primitivedrawable.cpp b/src/eepp/graphics/primitivedrawable.cpp
index b4eec29cd..12bf0316d 100644
--- a/src/eepp/graphics/primitivedrawable.cpp
+++ b/src/eepp/graphics/primitivedrawable.cpp
@@ -85,7 +85,7 @@ void PrimitiveDrawable::onPositionChange() {
 void PrimitiveDrawable::prepareVertexBuffer( const EE_DRAW_MODE& drawableType ) {
 	if ( mRecreateVertexBuffer ) {
 		eeSAFE_DELETE( mVertexBuffer );
-		mVertexBuffer = VertexBuffer::NewVertexArray( VERTEX_FLAGS_PRIMITIVE, drawableType );
+		mVertexBuffer = VertexBuffer::New( VERTEX_FLAGS_PRIMITIVE, drawableType );
 		mRecreateVertexBuffer = false;
 	}
 
diff --git a/src/eepp/graphics/vertexbuffervbo.cpp b/src/eepp/graphics/vertexbuffervbo.cpp
index 514d36616..c9c266ad6 100644
--- a/src/eepp/graphics/vertexbuffervbo.cpp
+++ b/src/eepp/graphics/vertexbuffervbo.cpp
@@ -131,11 +131,11 @@ void VertexBufferVBO::draw() {
 
 		glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER, mElementHandle );
 
-		glDrawElements( mDrawType, lSize, GL_UNSIGNED_INT, (char*)NULL );
+		GLi->drawElements( mDrawType, lSize, GL_UNSIGNED_INT, (char*)NULL );
 
 		glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER, 0 );
 	} else {
-		glDrawArrays( mDrawType, 0, getVertexCount() );
+		GLi->drawArrays( mDrawType, 0, getVertexCount() );
 	}
 
 	if ( GLv_3CP == GLi->version() ) {