Fetching timeout bugfixes