Fix playback issues