Calculator Fixes