diagnostics improvements
diagnostics improvements