Fixed issues with NPC use