diff --git a/src/network/servent.cpp b/src/network/servent.cpp
index 7e256da61..beea20765 100644
--- a/src/network/servent.cpp
+++ b/src/network/servent.cpp
@@ -325,7 +325,7 @@ Servent::createParallelConnection( Connection* orig_conn, Connection* new_conn,
         m.insert( "key", tmpkey );
         m.insert( "offer", key );
         m.insert( "port", externalPort() );
-        m.insert( "controlid", orig_conn->id() );
+        m.insert( "controlid", APP->nodeID() );
 
         QJson::Serializer ser;
         orig_conn->sendMsg( Msg::factory( ser.serialize(m), Msg::JSON ) );
@@ -469,7 +469,7 @@ Servent::reverseOfferRequest( ControlConnection* orig_conn, const QString& key,
     m["conntype"]  = "push-offer";
     m["key"]       = theirkey;
     m["port"]      = externalPort();
-    m["controlid"] = orig_conn->id();
+    m["controlid"] = APP->nodeID();
     new_conn->setFirstMessage( m );
     createParallelConnection( orig_conn, new_conn, QString() );
 }
diff --git a/src/transferview.cpp b/src/transferview.cpp
index e3d59c3f7..8fa38d17e 100644
--- a/src/transferview.cpp
+++ b/src/transferview.cpp
@@ -70,8 +70,8 @@ TransferView::fileTransferFinished( FileTransferConnection* ftc )
 void
 TransferView::onTransferUpdate()
 {
-    qDebug() << Q_FUNC_INFO;
     FileTransferConnection* ftc = (FileTransferConnection*)sender();
+    qDebug() << Q_FUNC_INFO << ftc->track().isNull() << ftc->source().isNull();
     if ( ftc->track().isNull() || ftc->source().isNull() )
         return;