More debugging fixes
Merge branch 'test' of https://github.com/Znalost/network into test