Make command line forgiving