Fixed invalid class references