fixes in CrossEntityReferenceLookup.java