Internal referencing fixes [skip ci].