fixed remaining references