Added fixes to args parser.