Fix special command completion