Retry if server unavailable, smaller fixes