Merge pull request #753 from reaperhulk/move-nids

Move some NIDs