Some playback fixes