Cleaning up bugs in --dry-run