fix more warnings
fix some of last warnings