More Calc changes