Warning messages corrections