Minor fix to command completion