Fixed more NPCs