Small NPC fixes
Merge pull request #911 from EPuncker/master

Small NPC fixes