Add some missing field names, plus the last unit misc_trait