Fix Some Bugs in the Fetchers