Improve handling of fade-outs during play