diff --git a/jsftp.js b/jsftp.js
index <HASH>..<HASH> 100644
--- a/jsftp.js
+++ b/jsftp.js
@@ -129,7 +129,7 @@ var Ftp = module.exports = function(cfg) {
             if (this.onTimeout)
                 this.onTimeout(new Error("FTP socket timeout"));
 
-            self.destroy();
+            this.destroy();
         }.bind(this));
 
         socket.on("connect", function() {
diff --git a/lib/ftpPasv.js b/lib/ftpPasv.js
index <HASH>..<HASH> 100644
--- a/lib/ftpPasv.js
+++ b/lib/ftpPasv.js
@@ -10,7 +10,7 @@ var S;
 try {
     S = require("streamer");
 } catch (e) {
-    S = require("./support/streamer");
+    S = require("../support/streamer/streamer");
 }
 
 var ftpPasv = module.exports = function(host, port, mode, callback, onConnect) {
Small bugfixes of scope and require