diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java
index b8c9d0b7c..1a1bc97b1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.jft;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -126,7 +127,12 @@ public final class JingleFileTransferManager extends Manager implements JingleDe
         return offer;
     }
 
-    public OutgoingFileRequestController requestFile(RemoteFile file) {
+    public OutgoingFileOfferController sendStream(InputStream stream, String filename, FullJid to) {
+        //TODO: Implement
+        return null;
+    }
+
+    public OutgoingFileRequestController requestFile(RemoteFile file, FullJid from) {
         JingleOutgoingFileRequest request = new JingleOutgoingFileRequest(file);
 
         //TODO at some point.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
index 9aba774ac..b23a89f60 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
@@ -376,17 +376,6 @@ public class JingleS5BTransport extends JingleTransport<JingleS5BTransportElemen
         }
     }
 
-    private void activateProxy(JingleS5BTransportCandidate candidate) throws SmackException.NotConnectedException, InterruptedException, XMPPException.XMPPErrorException, SmackException.NoResponseException {
-        LOGGER.log(Level.INFO, "Activate proxy: " + candidate.getCandidateId() + " " + candidate.getStreamHost().getAddress() + ":" + candidate.getStreamHost().getPort() + " " + candidate.getStreamHost().getJID() + " for " + getParent().getParent().getPeer());
-        Bytestream activate = new Bytestream(getStreamId());
-        activate.setMode(null);
-        activate.setType(IQ.Type.set);
-        activate.setTo(candidate.getStreamHost().getJID());
-        activate.setToActivate(getParent().getParent().getPeer());
-        activate.setFrom(getParent().getParent().getOurJid());
-        getParent().getParent().getJingleManager().getConnection().createStanzaCollectorAndSend(activate).nextResultOrThrow();
-    }
-
     @Override
     public void handleSessionAccept(JingleContentTransportElement transportElement, XMPPConnection connection) {
         JingleS5BTransportElement transport = (JingleS5BTransportElement) transportElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java
index 6e6302f1c..9fabcaa96 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java
@@ -17,7 +17,6 @@
 package org.jivesoftware.smackx.jingle.transport.jingle_s5b;
 
 import java.io.IOException;
-import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
@@ -97,6 +96,7 @@ public class JingleS5BTransportCandidate extends JingleTransportCandidate<Jingle
 
         switch (getType()) {
             case proxy:
+            case direct:
                 Socks5Client client;
                 if (peersProposal) {
                     String dstAddr = transport.getTheirDstAddr();
@@ -116,16 +116,6 @@ public class JingleS5BTransportCandidate extends JingleTransportCandidate<Jingle
                 this.socket = client.getSocket(timeout);
                 break;
 
-            case direct:
-                if (peersProposal) {
-                    LOGGER.log(Level.INFO, "Connect to foreign direct candidate " + getCandidateId() + " Address: " + getStreamHost().getAddress() + ":" + getStreamHost().getPort());
-                    this.socket = new Socket(getStreamHost().getAddress(), getStreamHost().getPort());
-                } else {
-                    LOGGER.log(Level.INFO, "Connect to our direct candidate " + getCandidateId() + " at port " + getStreamHost().getPort());
-                    this.socket = new ServerSocket(getStreamHost().getPort()).accept();
-                }
-                break;
-
             default:
                 LOGGER.log(Level.INFO, "Unsupported candidate type: " + getType());
                 break;
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportTest.java
index 980e4751e..02552367e 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportTest.java
@@ -197,7 +197,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
 
         String candidateActivated =
                 "<transport xmlns='urn:xmpp:jingle:transports:s5b:1' sid='vj3hs98y'>" +
-                        "<candidate-activated cid='hr65dqyd'/>" +
+                        "<activated cid='hr65dqyd'/>" +
                         "</transport>";
         JingleS5BTransportElement candidateActivatedTransport = new JingleS5BTransportProvider()
                 .parse(TestUtils.getParser(candidateActivated));