Improve processing and diagnostics.