Fix NPCs, again