small fixes around CanvasViewport