diff --git a/lib/msf/base/logging.rb b/lib/msf/base/logging.rb
index 6cae8ef879..790057520f 100644
--- a/lib/msf/base/logging.rb
+++ b/lib/msf/base/logging.rb
@@ -11,6 +11,7 @@ module Msf
 class Logging
 
 	@@initialized = false
+	@@session_logging = false
 
 	#
 	# Initialize logging.
@@ -56,14 +57,14 @@ class Logging
 	# Sets whether or not session logging is to be enabled.
 	#
 	def self.enable_session_logging(tf)
-		@session_logging = tf
+		@@session_logging = tf
 	end
 
 	#
 	# Returns whether or not session logging is enabled.
 	#
 	def self.session_logging_enabled?
-		@session_logging || false
+		@@session_logging || false
 	end
 
 	#
diff --git a/lib/rex/socket/switch_board.rb b/lib/rex/socket/switch_board.rb
index 74cd60f980..c4358d62fb 100644
--- a/lib/rex/socket/switch_board.rb
+++ b/lib/rex/socket/switch_board.rb
@@ -21,6 +21,10 @@ class SwitchBoard
 
 	include Singleton
 	include Enumerable
+
+	def initialize
+		@_initialized = false
+	end
 	
 	###
 	#
@@ -261,4 +265,4 @@ protected
 end
 
 end
-end
\ No newline at end of file
+end