fixed remaining warnings