Fixed entity errors