SF fixes