Final fix to viewports