Fix bugs where help wasn't displayed with -h or --help args