map-reduce sort: more fixes