More Sound Fixes

Change-Id: Ic8dec0c5e93ef001a3f52c41eec495138e095cce