Some args parser fix