Fix arg parsing/replacement