Yet more improvement on audio functions