Various NEI tweaks.  Fixes #1103.