Fix duplicate message acks and better message during recovery