Updates from dry-run review