More heartbeat improvements.