More shader fixes.
Merge pull request #3339 from ey6es/master

More shader fixes.