Adapt to the latest libcommuni (3.x) changes