Fixed cli args processing