Fix some warning messages