Fix various bugs in BatchFetcher. Still not any good tests though :(