Improve audio output logic and consistency