NPC cleanup and small fix