Fix startup errors
Merge pull request #1344 from Skillert/npc

Fix startup errors