More attempted GLES fixes