tweaks for GLES and fix for image_demo