Changes follow 1st dry-run.