Another thing to check would be the fitting connecting the heater core lines from the back of the intake manifold and the water pump. These have tendancy to corrode and break off in the manifold and pump. It can cause lots of water/coolant to leak. It is easier to replace the water pump but the intake manifold is a pain and will cost a lot.
-Mr. B