Small playback management fixes