More fixes to EGL GLContext