Minor fixes playback