Tweaks to NEI integration