fix EntityBase and OperationSettings