Minor tweaks in samples