Small fixes to the calculators