diff --git a/lib/msf/core/db_manager.rb b/lib/msf/core/db_manager.rb
index 2b2edf777c..d3058217e0 100644
--- a/lib/msf/core/db_manager.rb
+++ b/lib/msf/core/db_manager.rb
@@ -182,6 +182,9 @@ class DBManager
 
 		# Prefer the config file's pool setting
 		nopts['pool'] ||= 75
+		
+		# Prefer the config file's wait_timeout setting too
+		nopts['wait_timeout'] ||= 300
 
 		begin
 			self.migrated = false
diff --git a/modules/auxiliary/scanner/http/http_version.rb b/modules/auxiliary/scanner/http/http_version.rb
index 8450fd7658..fc98aa6d71 100644
--- a/modules/auxiliary/scanner/http/http_version.rb
+++ b/modules/auxiliary/scanner/http/http_version.rb
@@ -39,17 +39,11 @@ class Metasploit3 < Msf::Auxiliary
 	# Fingerprint a single host
 	def run_host(ip)
 		begin
-			connect(opts)
-			uri = opts[:uri] || '/'
-			method = opts[:method] || 'GET'
+			connect
 			
-			res = send_request_raw(
-				{
-					'uri'     => uri,
-					'method'  => method
-				})
-				
+			res = send_request_raw({'uri' => '/', 'method' => 'GET' })
 			return if not res
+			
 			fp = http_fingerprint(:response => res) 
 			print_status("#{ip}:#{rport} #{fp}") if fp
 		rescue ::Timeout::Error, ::Errno::EPIPE