SF2.3 fixes