More work on EGL implementation