Minor fixes, add tor/i2p server support for the single server version