Corrections due to changes in SFP library