Subject: ADIv5: fix more diagnostics