Fixed entity interfaces.