Small tweaks to diagnostics reporting.