More 4.2.2 merge fixes