Fixes for Aegir and using this module in bibliobird.