FIX: GLUT fixes