Fixing bugs to command line usage that made it difficult to run on AWS