More hacks for GLES building