Workaround for argparse bug + small changes.