Fix Selectors xref issues.