Here and there successiveRetryCount fixes.