DF Some fixes in samples.