SFM: Minor changes