-Fixes for OpenGL 3.0 after merge