Fixed playback problems