Merge video fixes from master tip