More args related fixes
Merge pull request #25 from saltstack/more_arg_fixes

More args related fixes