Minor fix (|PLAYERNAME|, NPC related)