Dev More merge fixes.