Argument parsing fixes
2 files changed