Added more diagnostics.