ENH: fixes for samples