Shader fixes and build.py clean up.