Adapt to new version of NaBL.