more Map/Reduce fixes