Fixed class refs