Added more Bib-1 diagnostics