Some args improvements.