Modular shader fixes
flakify
Merge pull request #315 from lcampagn/shader_fixes

Shader fixes