calculator 2.7 fixes