Multiple fixes to reflect 5.5 APIs