Minor changes (Calculator, division by zero)