Fix diagnostic messages