Fix class refs