Fix Entity.Delete() and Entity.FindById()