Fighting the short ones or the long ones that go through the pump and cover into the block? From the sounds of it, seems like the bolts that go through a water passage. Those tend to leak. If you end up breaking the bolts, Alloyboltz sells bolt kits for engines, and they are whom I got my Buick 350 bolt kit from. Intake, oil pan, timing cover water and fuel pump and valve cover. All the bad reviews are from people not reading instructions with the stainless hardware. Use antiseize, and DON'T over tighten or cross thread. Hopefully you won't have to deal with broken bolts, but it does happen. Good luck to ya. Still jealous of that score.