Warning messages tuned