More small changes to make sure the ProcessDatas run correctly.