Retry logic changes, setting changes