Minor nave/npm function tweaks.