Some more improvement on audio functions