heartbeat fixes