Playback fixes