Host information in Heartbeat fix.

Look at the diffs.