NPCs fixed