Fixes to the calculators to make them work.