Fix sample_data population