miscellaneous diagnostics improvements