Update warning messages & output format