Merge pull request #929 from egbertbouman/fixes

Small fixes
Merge pull request #932 from egbertbouman/fixes

DHT fix
Merge pull request #937 from egbertbouman/fixes

Fixes
Fix