Various fixes to update to 4.4 sources