Fixes for the shader stuff