Fix a couple of newly introduced bugs through CanvasProvider change.