Another tweak to make manual updates work nicer