More arg fixes
Merge pull request #171 from pass-by-value/more_arg_fixes

More arg fixes