SF2.3 compatibilty changes