diff --git a/nselib/ajp.lua b/nselib/ajp.lua
index 77501a515..cd9a2f346 100644
--- a/nselib/ajp.lua
+++ b/nselib/ajp.lua
@@ -521,5 +521,3 @@ Helper = {
 	end,
 	
 }
-
-return _ENV;
\ No newline at end of file
diff --git a/nselib/asn1.lua b/nselib/asn1.lua
index b175d4f82..9d259557b 100644
--- a/nselib/asn1.lua
+++ b/nselib/asn1.lua
@@ -277,12 +277,11 @@ ASN1Decoder = {
 --
 ASN1Encoder = {
 
-	new = function(self)
-		local o = {}
-		setmetatable(o, self)
-		self.__index = self
-		o:registerBaseEncoders()
-		return o
+	new = function(self,o)
+            o = o or {}
+            setmetatable(o, self)
+            self.__index = self
+            return o
     end,
 
 	---
@@ -333,14 +332,6 @@ ASN1Encoder = {
 			end
 		end
 		
-		-- Table encoder
-		self.encoder['table'] = function( self, val )
-			assert('table' == type(val), "val is not a table")
-			assert(#val.type > 0, "Table is missing the type field")
-			assert(val.value ~= nil, "Table is missing the value field")
-			return bin.pack("HAA", val.type, self.encodeLength(#val.value), val.value)
-		end
-		
 		-- Integer encoder
 		self.encoder['number'] = function( self, val )
 			local ival = self.encodeInt(val)
diff --git a/nselib/json.lua b/nselib/json.lua
index c3be97487..233122b96 100644
--- a/nselib/json.lua
+++ b/nselib/json.lua
@@ -32,18 +32,18 @@ _ENV = stdnse.module("json", stdnse.seeall)
 
 --Some local shortcuts
 local function dbg(str,...)
-	stdnse.print_debug("Json:"..str, ...)
+	stdnse.print_debug("Json:"..str, table.unpack(arg))
 end
 local function d4(str,...)
-	if nmap.debugging() > 3 then dbg(str,...) end
+	if nmap.debugging() > 3 then dbg(str,table.unpack(arg)) end
 end
 local function d3(str,...)
-	if nmap.debugging() > 2 then dbg(str,...) end
+	if nmap.debugging() > 2 then dbg(str,table.unpack(arg)) end
 end
 
 --local dbg =stdnse.print_debug
 local function dbg_err(str,...)
-	stdnse.print_debug("json-ERR:"..str, ...)
+	stdnse.print_debug("json-ERR:"..str, table.unpack(arg))
 end
 
  -- Javascript null representation, see explanation above
diff --git a/nselib/smb.lua b/nselib/smb.lua
index bb1e1610f..b86a36bc7 100644
--- a/nselib/smb.lua
+++ b/nselib/smb.lua
@@ -121,7 +121,6 @@
 -- @author Ron Bowes <ron@skullsecurity.net>
 -- @copyright Same as Nmap--See http://nmap.org/book/man-legal.html
 -----------------------------------------------------------------------
-local asn1 = require "asn1"
 local bin = require "bin"
 local bit = require "bit"
 local coroutine = require "coroutine"
@@ -1030,9 +1029,6 @@ function negotiate_protocol(smb, overrides)
 	if(smb['key_length'] == nil) then
 		smb['key_length'] = 0
 	end
-	if(smb['byte_count'] == nil) then
-		smb['byte_count'] = 0
-	end
 
 	-- Convert the time and timezone to more useful values
 	smb['time'] = (smb['time'] / 10000000) - 11644473600
@@ -1057,11 +1053,6 @@ function negotiate_protocol(smb, overrides)
 		if(smb['server_guid'] == nil) then
 			return false, "SMB: ERROR: Server returned less data than it was supposed to (one or more fields are missing); aborting [12]"
 		end
-
-		-- do we have a security blob?
-		if ( #data - pos > 0 ) then
-			pos, smb['security_blob'] = bin.unpack("<A" .. #data - pos, data, pos )
-		end
 	else
 		pos, smb['server_challenge'] = bin.unpack(string.format("<A%d", smb['key_length']), data)
 		if(smb['server_challenge'] == nil) then
@@ -1287,14 +1278,7 @@ local function start_session_extended(smb, log_errors, overrides)
 			return result, username
 		end
 	end
-	
-	-- check what kind of security blob we were given in the negotiate protocol request
-	local sp_nego = false
-	if ( smb['security_blob'] and #smb['security_blob'] > 11 ) then
-		local pos, oid = bin.unpack(">A6", smb['security_blob'], 5)
-		sp_nego = ( oid == "\x2b\x06\x01\x05\x05\x02" ) -- check for SPNEGO OID 1.3.6.1.5.5.2
-	end
-	
+
 	while result ~= false do
 		-- These are loop variables
 		local security_blob = nil
@@ -1303,42 +1287,7 @@ local function start_session_extended(smb, log_errors, overrides)
 		-- This loop takes care of the multiple packets that "extended security" requires
 		repeat
 			-- Get the new security blob, passing the old security blob as a parameter. If there was no previous security blob, then nil is passed, which creates a new one
-			if ( not(security_blob) ) then
-				status, security_blob, smb['mac_key'] = smbauth.get_security_blob(security_blob, smb['ip'], username, domain, password, password_hash, hash_type, (sp_nego and 0x00088215))
-
-				if ( sp_nego ) then
-					local enc = asn1.ASN1Encoder:new()
-					local mechtype = enc:encode( { type = 'A0', value = enc:encode( { type = '30', value = enc:encode( { type = '06', value = bin.pack("H", "2b06010401823702020a") } ) } ) } )					
-					local oid = enc:encode( { type = '06', value = bin.pack("H", "2b0601050502") } )
-					
-					security_blob = enc:encode(security_blob)
-					security_blob = enc:encode( { type = 'A2', value = security_blob } )
-					security_blob = mechtype .. security_blob
-					security_blob = enc:encode( { type = '30', value = security_blob } )
-					security_blob = enc:encode( { type = 'A0', value = security_blob } )
-					security_blob = oid .. security_blob
-					security_blob = enc:encode( { type = '60', value = security_blob } )
-					
-				end
-			else
-				if ( sp_nego ) then
-					if ( smb['domain'] or smb['server'] and ( not(domain) or #domain == 0 ) ) then
-						domain = smb['domain'] or smb['server']
-					end
-					hash_type = "v2"
-				end
-				
-				status, security_blob, smb['mac_key'] = smbauth.get_security_blob(security_blob, smb['ip'], username, domain, password, password_hash, hash_type, (sp_nego and 0x00088215))
-				
-				if ( sp_nego ) then
-					local enc = asn1.ASN1Encoder:new()
-					security_blob = enc:encode(security_blob)
-					security_blob = enc:encode( { type = 'A2', value = security_blob } )
-					security_blob = enc:encode( { type = '30', value = security_blob } )
-					security_blob = enc:encode( { type = 'A1', value = security_blob } )
-				end
-				
-			end
+			status, security_blob, smb['mac_key'] = smbauth.get_security_blob(security_blob, smb['ip'], username, domain, password, password_hash, hash_type)
 
 			-- There was an error processing the security blob	
 			if(status == false) then
@@ -1402,12 +1351,6 @@ local function start_session_extended(smb, log_errors, overrides)
 		
 				-- Parse the data
 				pos, security_blob, os, lanmanager = bin.unpack(string.format("<A%dzz", security_blob_length), data)
-
-				if ( status_name == "NT_STATUS_MORE_PROCESSING_REQUIRED" and sp_nego ) then
-					local start = security_blob:find("NTLMSSP")
-					security_blob = security_blob:sub(start)
-				end
-				
 				if(security_blob == nil or lanmanager == nil) then
 					return false, "SMB: ERROR: Server returned less data than it was supposed to (one or more fields are missing); aborting [19]"
 				end
@@ -2739,7 +2682,7 @@ function find_files(smbstate, fname, options)
 				-- TODO: cleanup fe.s_fname
 				pos, fe.fname = bin.unpack("A" .. f_len, response.data, pos)
 				pos = last_pos + ne
-
+			
 				-- removing trailing zero bytes from file name
 				fe.fname = fe.fname:sub(1, -2)
 				last_name = fe.fname
diff --git a/nselib/smbauth.lua b/nselib/smbauth.lua
index c40ec5006..29873b344 100644
--- a/nselib/smbauth.lua
+++ b/nselib/smbauth.lua
@@ -667,10 +667,10 @@ function get_password_response(ip, username, domain, password, password_hash, ha
 	return lm_response, ntlm_response, mac_key
 end
 
-function get_security_blob(security_blob, ip, username, domain, password, password_hash, hash_type, flags)
+function get_security_blob(security_blob, ip, username, domain, password, password_hash, hash_type)
 	local pos = 1
 	local new_blob
-	local flags = flags or 0x00008215 -- (NEGOTIATE_SIGN_ALWAYS | NEGOTIATE_NTLM | NEGOTIATE_SIGN | REQUEST_TARGET | NEGOTIATE_UNICODE)
+	local flags = 0x00008215 -- (NEGOTIATE_SIGN_ALWAYS | NEGOTIATE_NTLM | NEGOTIATE_SIGN | REQUEST_TARGET | NEGOTIATE_UNICODE)
 
 	if(security_blob == nil) then
 		-- If security_blob is nil, this is the initial packet
@@ -684,8 +684,10 @@ function get_security_blob(security_blob, ip, username, domain, password, passwo
 
 		return true, new_blob, "", ""
 	else
+		local identifier, message_type, domain_length, domain_max, domain_offset, server_flags, challenge, reserved
+
 		-- Parse the old security blob
-		local pos, identifier, message_type, domain_length, domain_max, domain_offset, server_flags, challenge, reserved = bin.unpack("<LISSIIA8A8", security_blob, 1)
+		pos, identifier, message_type, domain_length, domain_max, domain_offset, server_flags, challenge, reserved = bin.unpack("<LISSIIA8A8", security_blob, 1)
 
 		-- Get the information for the current login
         local lanman, ntlm, mac_key = get_password_response(ip, username, domain, password, password_hash, hash_type, challenge, true)
diff --git a/nselib/xmpp.lua b/nselib/xmpp.lua
index b43add7be..f55bdb642 100644
--- a/nselib/xmpp.lua
+++ b/nselib/xmpp.lua
@@ -121,7 +121,7 @@ XMPP = {
 					options = options or {},
 					auth = { mechs = {} } }
 		o.options.timeout = o.options.timeout and o.options.timeout or 10
-		o.servername = stdnse.get_hostname(host) or o.options.servername
+		o.servername = host.targetname or o.options.servername
 		setmetatable(o, self)
         self.__index = self
 		return o
diff --git a/scripts/afp-serverinfo.nse b/scripts/afp-serverinfo.nse
index 0e17450dc..ce4689fbb 100644
--- a/scripts/afp-serverinfo.nse
+++ b/scripts/afp-serverinfo.nse
@@ -73,7 +73,7 @@ action = function(host, port)
   -- get our data
   afp_proto = afp.Proto:new( { socket=socket } )
 
-  local response = afp_proto:fp_get_server_info( socket )
+  response = afp_proto:fp_get_server_info( socket )
   response = response.result
   
   -- all the server information is output in the order it occurs in the server