YARN and MR2 adjustments