Merge fixes with 2.4.3