Autocalculation fixes

Some small UI behavior fixes.