Made friendly NPC interaction more forgiving