minor fixes for command line arguments handling