dry-run fixes