More EmptyEntity fixes.