More diagnostics changes