New fixes to heartbeat.