Bug fixes to make compatible with SS 2.4