Adapt to latest libnpa