Fix numerous broken references.