Minor updates for ordering final dataset