Some fixes to playback