For what it's worth, I had continuing small leaks at the grommets mentioned above (heat exchanger to crossover tube or thermostat housing). That persisted new grommets or not. I finally used some bellows adhesive between the grommet and the crossover tube, the outside of the grommet (not on the heat exchanger or inside the grommet) and that appears to have solved that problem once and for all.