Changed SF samples given Nik's latest bug fixes