Couple of bib fixes