Fix resourceTypes and traits