fixed remaining compile errors.