Viewport and GA fix