correct some warnings
correct more  warnings