Fix references...again.