Fixup
Improve argument parsing