Fix up audio more