Fixed some issues with Canvas