Add even more diagnostics