Fix incompatible declarations.
Make sure the right operator is used for entity creation.