Fixed command arg code errors