SFM: Small fixes for new code