Fixed warning messages