Update class refs to fix #446