Minor fixes in sample_data command