2 fields dropped in 15->16 migration