Minor changes to Map/Reduce and Random Data stages