Fix a couple minor command line completion issues