diff --git a/lib/rex/post/meterpreter/channel.rb b/lib/rex/post/meterpreter/channel.rb
index 9f65c31bd0..01c079cdb9 100644
--- a/lib/rex/post/meterpreter/channel.rb
+++ b/lib/rex/post/meterpreter/channel.rb
@@ -278,7 +278,7 @@ class Channel
 		request.add_tlv(TLV_TYPE_CHANNEL_ID, cid)
 		request.add_tlvs(addends)
 
-		client.send_request(request)
+		client.send_request(request, nil)
 
 		# Disassociate this channel instance
 		client.remove_channel(cid)
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb b/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb
index f7817ea78c..56e84bb806 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb
@@ -18,7 +18,7 @@ module Fs
 ###
 class Dir < Rex::Post::Dir
 
-	class <<self
+	class << self
 		attr_accessor :client
 	end
 
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb b/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb
index 56495858e4..318ba01335 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb
@@ -28,7 +28,7 @@ Separator = "\\"
 
 	include Rex::Post::File
 	
-	class <<self
+	class << self
 		attr_accessor :client
 	end
 	
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/sys/event_log.rb b/lib/rex/post/meterpreter/extensions/stdapi/sys/event_log.rb
index b209934757..86e042a090 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/sys/event_log.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/sys/event_log.rb
@@ -179,7 +179,7 @@ class EventLog
 	def self.close(client, handle)
 		request = Packet.create_request('stdapi_sys_eventlog_close')
 		request.add_tlv(TLV_TYPE_EVENT_HANDLE, handle);
-		response = client.send_request(request)
+		response = client.send_request(request, nil)
 		return nil
 	end
 	
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb b/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
index d118ac853d..ac8b91e76a 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
@@ -312,7 +312,7 @@ class Process < Rex::Post::Process
 	def self.close(client, handle)
 		request = Packet.create_request('stdapi_sys_process_close')
 		request.add_tlv(TLV_TYPE_HANDLE, handle)
-		response = client.send_request(request)
+		response = client.send_request(request, nil)
 		handle = nil;
 		return true
 	end
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/sys/registry_subsystem/registry_key.rb b/lib/rex/post/meterpreter/extensions/stdapi/sys/registry_subsystem/registry_key.rb
index 1080568079..437619abac 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/sys/registry_subsystem/registry_key.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/sys/registry_subsystem/registry_key.rb
@@ -107,7 +107,7 @@ class RegistryKey
 	#
 	def self.close(client, hkey)
 		if hkey != nil
-			return client.sys.registry.close_key(hkey)
+			return client.sys.registry.close_key(hkey, nil)
 		end
 
 		return false	
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/sys/thread.rb b/lib/rex/post/meterpreter/extensions/stdapi/sys/thread.rb
index 74a9f3927d..f89b4fc027 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/sys/thread.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/sys/thread.rb
@@ -161,7 +161,7 @@ class Thread < Rex::Post::Thread
 	def self.close(client, handle)
 		request = Packet.create_request('stdapi_sys_process_thread_close')
 		request.add_tlv(TLV_TYPE_THREAD_HANDLE, handle)
-		client.send_request(request)
+		client.send_request(request, nil)
 		handle = nil
 		return true
 	end
diff --git a/lib/rex/post/meterpreter/packet_dispatcher.rb b/lib/rex/post/meterpreter/packet_dispatcher.rb
index 42920598de..e2ca062191 100644
--- a/lib/rex/post/meterpreter/packet_dispatcher.rb
+++ b/lib/rex/post/meterpreter/packet_dispatcher.rb
@@ -83,6 +83,12 @@ module PacketDispatcher
 	# Sends a packet and waits for a timeout for the given time interval.
 	#
 	def send_request(packet, t = self.response_timeout)
+		
+		if not t
+			send_packet(packet)
+			return nil
+		end
+	
 		response = send_packet_wait_response(packet, t)
 
 		if (response == nil)