Fixing some stuff including dry-run option