Some NPC bug fixes