Fixed tools so you can build canvas master and canvas CR