Hi, I'm in the middle of doing an engine swap to resurrect a '98. Have a recently rebuilt npi block with pi heads and stage 2 comp cams going in. I've removed the old engine and swapped the coils, replaced the clutch, water pump as well. I fought and removed the earlier version coolant nipple behind the water pump and purchased a dorman replacement pi version with the 2 o rings. It does not fit very tight in the block. One small tap and it is in place or removed. Is that normal? I feel like that is relying a lot on rtv to hold it. Also, I've read conflicting discussion on headers. I've got them, but was having second thoughts due to the issues installing and running them with the clearance issues.