Correct some warnings