Batch fix traits?