Fixed issues with Sf 2.3