Fixes of the CANVAS 2