diff --git a/NEW b/NEW
index ad8c74c..cffa73c 100644
--- a/NEW
+++ b/NEW
@@ -2,7 +2,7 @@ What's New
 
 This is just a bug-fix/update release.
 
-    * Fixed: crash when reading '*a' on closed socket (Duck);
+    * Fixed: crash when reading '*a' on closed socket (Paul Ducklin);
     * Fixed: return values are consistent when reading from closed sockets;
     * Fixed: case sensitivity in headers of multipart messages in 
       smtp.message() (Graham Henstridge);
diff --git a/doc/index.html b/doc/index.html
index 0d41941..1605af1 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -137,7 +137,7 @@ has been helping a lot too! Thanks to you all!
 </p>
 
 <ul>
-<li> Fixed: crash when reading '*a' on closed socket (Duck);
+<li> Fixed: crash when reading '*a' on closed socket (Paul Ducklin);
 <li> Fixed: return values are consistent when reading from closed sockets;
 <li> Fixed: case sensitivity in headers of multipart
 messages in smtp.message() (Graham Henstridge);
diff --git a/src/ftp.lua b/src/ftp.lua
index 18d22f7..f27e838 100644
--- a/src/ftp.lua
+++ b/src/ftp.lua
@@ -88,7 +88,7 @@ function metat.__index:port(ip, port)
         ip, port = self.try(self.tp:getcontrol():getsockname())
         self.server = self.try(socket.bind(ip, 0))
         ip, port = self.try(self.server:getsockname())
-        self.try(server:settimeout(TIMEOUT))
+        self.try(self.server:settimeout(TIMEOUT))
     end
     local pl = math.mod(port, 256)
     local ph = (port - pl)/256
@@ -187,9 +187,9 @@ end
 -----------------------------------------------------------------------------
 -- High level FTP API
 -----------------------------------------------------------------------------
-function override(t)
+local function override(t)
     if t.url then
-        u = url.parse(t.url)
+        local u = url.parse(t.url)
         for i,v in base.pairs(t) do
             u[i] = v
         end