bugfixes in Canvas classes