Fix references again