Fix video playback issue and minor fixes