fix some upstream comments