Fixes for GLES2