Fix some class references