Issue 137 and 138

Should be tested with scion-core https://github.com/jbeard4/SCION-CORE/tree/issue-138

Closes #138