Fix references and incorrect underline