Further Tor fixes