Fix a couple of bugs in MapReduce