More audio fixes