orch: py3 fixes
orch: (more) py3 fixes
Merge pull request #1 from hwaf/wip/py3-support

Wip/py3 support