Some tweaks again.
Fix compilation errors for older OpenGL