Couple of fixes for video export.