Diagnostic tweaks