Make ack a bit more node aware