OpenGL fixing
merge fixing