Fixes for EGL