Fixed few XREF issues.