Some fixes to argparse