Sound Lib fixes