Fix some errors in sample_data command