Small calculator fixes