Fixes couple of regressions in the video playback