Fix GLSL errors on OS X, slightly nicer cross