Warning messages fix