Bib fixes