More fixes for OpenGL 3