Playback bugfixing