DF Another fixes in samples.