Fix a few problems from converting from mapreduce -> mapred