Fixes for sounds