diff --git a/nselib/msrpc.lua b/nselib/msrpc.lua
index 28690033f..306aba497 100644
--- a/nselib/msrpc.lua
+++ b/nselib/msrpc.lua
@@ -200,9 +200,8 @@ local UUID2EXE = {
 --@return status true or false
 --@return smbstate if status is true, or an error message.
 function start_smb(host, path, disable_extended, overrides)
-  local sharename
   overrides = overrides or {}
-  _, sharename = smb.get_fqpn(host, "IPC$")
+  local _, sharename = smb.get_fqpn(host, "IPC$")
   return smb.start_ex(host, true, true, sharename, path, disable_extended, overrides)
 end
 
@@ -666,18 +665,15 @@ end
 --        useful one being 'shares', which is a list of the system's shares.
 function srvsvc_netsharegetinfo(smbstate, server, share, level)
   stdnse.debug2("Calling NetShareGetInfo(%s, %s, %d)", server, share, level)
-  local status, result, sharename
-  local arguments
-  local pos, align
 
   --NetGetShareInfo seems to reject FQPN and reads the server value from the request
   --If any function called this function using a FQPN, this should take care of it.
-  _, _, sharename = string.find(share, "\\\\.*\\(.*)")
+  local _, _, sharename = string.find(share, "\\\\.*\\(.*)")
   if sharename then
     share = sharename
   end
   --    [in]   [string,charset(UTF16)] uint16 *server_unc,
-  arguments = msrpctypes.marshall_unicode_ptr("\\\\" .. server, true)
+  local arguments = msrpctypes.marshall_unicode_ptr("\\\\" .. server, true)
 
   --    [in]   [string,charset(UTF16)] uint16 share_name[],
   .. msrpctypes.marshall_unicode(share, true)
@@ -689,7 +685,7 @@ function srvsvc_netsharegetinfo(smbstate, server, share, level)
 
 
   -- Do the call
-  status, result = call_function(smbstate, 0x10, arguments)
+  local status, result = call_function(smbstate, 0x10, arguments)
   if(status ~= true) then
     return false, result
   end
@@ -698,7 +694,7 @@ function srvsvc_netsharegetinfo(smbstate, server, share, level)
 
   -- Make arguments easier to use
   arguments = result['arguments']
-  pos = 1
+  local pos = 1
 
   --    [in]   [string,charset(UTF16)] uint16 *server_unc,
   --    [in]   [string,charset(UTF16)] uint16 share_name[],
diff --git a/nselib/smb.lua b/nselib/smb.lua
index 1c03f58ea..a2f3a6d2b 100644
--- a/nselib/smb.lua
+++ b/nselib/smb.lua
@@ -3449,19 +3449,18 @@ end
 -- 'false' is simply returned.
 function is_admin(host, username, domain, password, password_hash, hash_type)
   local msrpc = require "msrpc" -- avoid require cycle
-  local status, smbstate, err, result, fqpn_share
   local overrides = get_overrides(username, domain, password, password_hash, hash_type)
 
   stdnse.debug1("SMB: Checking if %s is an administrator", username)
 
-  status, smbstate = start(host)
+  local status, smbstate = start(host)
   if(status == false) then
     stdnse.debug1("SMB; is_admin: Failed to start SMB: %s [%s]", smbstate, username)
     stop(smbstate)
     return false
   end
 
-  status, err      = negotiate_protocol(smbstate, overrides)
+  local status, err      = negotiate_protocol(smbstate, overrides)
   if(status == false) then
     stdnse.debug1("SMB; is_admin: Failed to negotiate protocol: %s [%s]", err, username)
     stop(smbstate)
@@ -3474,8 +3473,8 @@ function is_admin(host, username, domain, password, password_hash, hash_type)
     stop(smbstate)
     return false
   end
-  
-  _, fqpn_share = get_fqpn(host, "IPC$")
+
+  local _, fqpn_share = get_fqpn(host, "IPC$")
   status, err      = tree_connect(smbstate, fqpn_share, overrides)
   if(status == false) then
     stdnse.debug1("SMB; is_admin: Failed to connect tree: %s [%s]", err, username)
@@ -4234,10 +4233,10 @@ namedpipes =
       self.name = namedpipes.make_pipe_name( self._host.ip, self._pipeSubPath )
 
       stdnse.debug2("%s: Connecting to named pipe: %s", NP_LIBRARY_NAME, self.name )
-      local status, result, errorMessage, fqpn_share
+      local errorMessage
       local bool_negotiate_protocol, bool_start_session, bool_disable_extended = true, true, false
-      _, fqpn_share = get_fqpn(host, "IPC$")
-      status, result = start_ex( self._host, bool_negotiate_protocol, bool_start_session,
+      local _, fqpn_share = get_fqpn(host, "IPC$")
+      local status, result = start_ex( self._host, bool_negotiate_protocol, bool_start_session,
         fqpn_share, self._pipeSubPath, bool_disable_extended, self._overrides )
 
       if status then
diff --git a/scripts/openwebnet-discovery.nse b/scripts/openwebnet-discovery.nse
index 73894ad90..e57866b01 100755
--- a/scripts/openwebnet-discovery.nse
+++ b/scripts/openwebnet-discovery.nse
@@ -2,6 +2,7 @@ local stdnse = require "stdnse"
 local shortport = require "shortport"
 local comm = require "comm"
 local string = require "string"
+local table = require "table"
 
 description = [[
 OpenWebNet is a communications protocol developed by Bticino since 2000.
diff --git a/scripts/puppet-naivesigning.nse b/scripts/puppet-naivesigning.nse
index 0505d8243..ff1916d01 100644
--- a/scripts/puppet-naivesigning.nse
+++ b/scripts/puppet-naivesigning.nse
@@ -2,6 +2,7 @@ local shortport = require "shortport"
 local stdnse = require "stdnse"
 local http = require "http"
 local vulns = require "vulns"
+local string = require "string"
 local table = require "table"
 local io = require "io"
 local base64 = require "base64"