Fix new/edit data types