Fix entity bugs in possessive names