Add some retries to fetching
Fix fetch timeout