Minimal changes for biblatex support