Bib + acro fixes