Fix player: and npc: issues