More GLSL3+ compatibility fixes