Heartbeat improvements