Even moar Viewport fixes