various video fixes
Merge pull request #4741 from guardian/video-fixes

various video fixes