Add more 4.4.4 merge fixes