Compatibility sf 2.3 and more improvements