ResultVal in a few more places.
Fix bug that I introduced in Archive creation
Attempt to fix Travis build