Fix models to be compatible with protected_attributes