Misc bib fixes