Safer XRefs, fix defined issue with version/date