Fix a few more minor warnings. (Shader change from @flibitijibibo)
Merge pull request #2454 from danzel/more-warnings

Fix a few more minor warnings