Diagnostic improvements.