Make sure the fetcher calls complete, fix a few other things