More compat. changes to allow use in SS 2.4