Adapt libs to Christoph's latest changes as of version 2.22