Minor changes in canvasWrapper