Fixed some playback issues