More bug fixes related to Hadoop v2.