Some updates to support sf2.2