Custom bugfixes in the Bib2x codebase