Small improvements to samples.