Changes for gles2 and no-kms