Fix some sound issues