Minor clean-ups
Avoided a crash in openGL when running on very old Windows drivers.