More args related fixes