more fixes for retry