Normalize some refeences