Canvas fixes