Corrections to get_data