diff --git a/src/eepp/graphics/cvertexbuffervbo.cpp b/src/eepp/graphics/cvertexbuffervbo.cpp
index b65a67b52..50fe7885a 100644
--- a/src/eepp/graphics/cvertexbuffervbo.cpp
+++ b/src/eepp/graphics/cvertexbuffervbo.cpp
@@ -112,8 +112,10 @@ void cVertexBufferVBO::Draw() {
 	#endif
 	if ( GLv_3 == GLi->Version() || GLv_ES2 == GLi->Version() ) {
 		#if !defined( EE_GLES ) && EE_PLATFORM != EE_PLATFORM_HAIKU
-		glGetIntegerv( GL_VERTEX_ARRAY_BINDING, &curVAO );
-		glBindVertexArray( mVAO );
+		if ( GLv_3 == GLi->Version() ) {
+			glGetIntegerv( GL_VERTEX_ARRAY_BINDING, &curVAO );
+			glBindVertexArray( mVAO );
+		}
 		#endif
 
 		if ( !mTextured ) {
@@ -172,7 +174,7 @@ void cVertexBufferVBO::SetVertexStates() {
 		GLi->EnableClientState( GL_VERTEX_ARRAY );
 		glBindBufferARB( GL_ARRAY_BUFFER, mArrayHandle[ VERTEX_FLAG_POSITION ] );
 		#ifdef EE_GL3_ENABLED
-		if ( GLv_3 == GLi->Version() || GLv_ES2 == GLi->Version() ) {
+		if ( GLv_3 == GLi->Version() ) {
 			index = GLi->GetRendererGL3()->GetStateIndex( EEGL_VERTEX_ARRAY );
 
 			if ( -1 != index ) {
@@ -194,7 +196,7 @@ void cVertexBufferVBO::SetVertexStates() {
 		glBindBufferARB( GL_ARRAY_BUFFER, mArrayHandle[ VERTEX_FLAG_COLOR ] );
 
 		#ifdef EE_GL3_ENABLED
-		if ( GLv_3 == GLi->Version() || GLv_ES2 == GLi->Version() ) {
+		if ( GLv_3 == GLi->Version() ) {
 			index = GLi->GetRendererGL3()->GetStateIndex( EEGL_COLOR_ARRAY );
 
 			if ( -1 != index )
@@ -219,7 +221,7 @@ void cVertexBufferVBO::SetVertexStates() {
 				glBindBufferARB( GL_ARRAY_BUFFER, mArrayHandle[ VERTEX_FLAG_TEXTURE0 + i ] );
 
 				#ifdef EE_GL3_ENABLED
-				if ( GLv_3 == GLi->Version() || GLv_ES2 == GLi->Version() ) {
+				if ( GLv_3 == GLi->Version() ) {
 					index = GLi->GetRendererGL3()->GetStateIndex( EEGL_TEXTURE_COORD_ARRAY );
 
 					if ( -1 != index && 0 == i )
@@ -247,7 +249,7 @@ void cVertexBufferVBO::SetVertexStates() {
 			glBindBufferARB( GL_ARRAY_BUFFER, mArrayHandle[ VERTEX_FLAG_TEXTURE0 ] );
 
 			#ifdef EE_GL3_ENABLED
-			if ( GLv_3 == GLi->Version() || GLv_ES2 == GLi->Version() ) {
+			if ( GLv_3 == GLi->Version() ) {
 				index = GLi->GetRendererGL3()->GetStateIndex( EEGL_TEXTURE_COORD_ARRAY );
 
 				if ( -1 != index )
diff --git a/src/eepp/graphics/renderer/shaders/base.vert b/src/eepp/graphics/renderer/shaders/base.vert
index 5fba05d68..7c35aa847 100644
--- a/src/eepp/graphics/renderer/shaders/base.vert
+++ b/src/eepp/graphics/renderer/shaders/base.vert
@@ -20,7 +20,6 @@ void main(void)\n\
 {\n\
 	dgl_Color		= dgl_FrontColor;\n\
 	dgl_TexCoord[0]	= dgl_MultiTexCoord0;\n\
-	vec4 vEye		= dgl_ModelViewMatrix * dgl_Vertex;\n\
-	gl_Position		= dgl_ProjectionMatrix * vEye;\n\
+	gl_Position		= dgl_ProjectionMatrix * ( dgl_ModelViewMatrix * dgl_Vertex );\n\
 }\n\
 ";
diff --git a/src/eepp/graphics/renderer/shaders/pointsprite.vert b/src/eepp/graphics/renderer/shaders/pointsprite.vert
index bf1afe809..55d6066b6 100644
--- a/src/eepp/graphics/renderer/shaders/pointsprite.vert
+++ b/src/eepp/graphics/renderer/shaders/pointsprite.vert
@@ -15,6 +15,5 @@ void main(void)\n\
 {\n\
 	gl_PointSize	= dgl_PointSize;\n\
 	dgl_Color		= dgl_FrontColor;\n\
-	vec4 vEye		= dgl_ModelViewMatrix * dgl_Vertex;\n\
-	gl_Position		= dgl_ProjectionMatrix * vEye;\n\
+	gl_Position		= dgl_ProjectionMatrix * ( dgl_ModelViewMatrix * dgl_Vertex );\n\
 }";
diff --git a/src/eepp/graphics/renderer/shaders/primitive.vert b/src/eepp/graphics/renderer/shaders/primitive.vert
index 76336ba53..13063c71a 100644
--- a/src/eepp/graphics/renderer/shaders/primitive.vert
+++ b/src/eepp/graphics/renderer/shaders/primitive.vert
@@ -13,6 +13,5 @@ varying				vec4 dgl_Color;\n\
 void main(void)\n\
 {\n\
 	dgl_Color		= dgl_FrontColor;\n\
-	vec4 vEye		= dgl_ModelViewMatrix * dgl_Vertex;\n\
-	gl_Position		= dgl_ProjectionMatrix * vEye;\n\
+	gl_Position		= dgl_ProjectionMatrix * ( dgl_ModelViewMatrix * dgl_Vertex );\n\
 }";