Fix some playback issues which crash the app