Fixups for Entity associations