Fixed class references