Minor changes to support ONE 4.4+