SF bug fixes