Fix player: and npc: arguments