Minor fixes for later-on OpenGL ES support