[Calc] Fix things