Minor fixes which may prevent handling of isPartOf/hasPart