Restructured receive, heartbeat and ack corrections