Canvas bugfixes