Further changes to data_split and auto_roi