Pulled the instrument cluster back out. Apparently the two bulbs not working were just a little bit loose in the socket. They are push in type, so I pulled them out and put them back, pressed down a little and they work fine. I checked every wire and connector for continuity, all checked good. While I had it out, I added two warning lights, one each for the water temp and the oil pressure, right beside their respective gauges. Started getting dark before I could get all of the connections wired up again. Should be rewired and an easy install later this week.