Sound code fixes