Fix ClArgs