SS2.4 compat. changes