Adapt to latest libcommuni/master