Calc fixes from gfon