Some fixes to the samples