Fix a regression and save/update check.