adjust to new error/warning messages