Calc fixes from Fontaras