Fix a few more minor warnings

Includes Shader change from @flibitijibibo <3

The Song FinishedPlayingHandler/DonePlaying block is looking a bit hacky now, we probably want to revisit it later.
refs #2433