some more fixes/patches for compilation with opengl