Some additional adjustments based upon debugging while not dryRun.