Updating canvas integration, minor changes

Some minor changes for #711