Finished Sound fixes