Minor changes in npc.h