Fixed up more gl_state possible problems