Minor heartbeat changes