Fix miss replace
Fix timeout & dry-run options