Small changes to the utils/samples framework