Sound fixes
Merge pull request #5822 from mwerezak/sounds

Sound fixes