Improved diagnostics.