Fixed the other calculators