More fixes to the playback logic