Small fixes
Small code clean up
Merge remote-tracking branch 'chris/devel' into anontunnel