Fix arg handling