Adapt latest Wikibase changes