fix retry and acks