Fixes to sound