Fixes for mapred