Misc canvas changes