Further relay fixes
Merge remote-tracking branch 'TomP2P/master'