Small calculator fixes (2)