Fixes to setting sound/music volume

Also see commit 840160e20008718675129c09195571647130b855.