Eliminate warning & some other fix.