Fixing for new versions of libraries and for CI on local hudson