Mostly resolve retry issues