Update to fix use of command line arguments