Minor fixes in sample-data command