Heartbeat improvements

This fixes/improves a situation where we would delete the kite even if we still get heartbeats.