Changes to mapred as recommended by Jared