diff --git a/data/plugins/bootstrap.rb b/data/plugins/bootstrap.rb
index 907ac4dc..c2971495 100644
--- a/data/plugins/bootstrap.rb
+++ b/data/plugins/bootstrap.rb
@@ -22,6 +22,7 @@ java_import 'org.apollo.game.model.World'
 java_import 'org.apollo.game.model.entity.Player'
 java_import 'org.apollo.game.model.setting.PrivilegeLevel'
 java_import 'org.apollo.game.scheduling.ScheduledTask'
+java_import 'org.apollo.util.plugin.PluginContext'
 
 # Alias the privilege levels.
 RIGHTS_ADMIN    = PrivilegeLevel::ADMINISTRATOR
@@ -196,17 +197,17 @@ def on_command(args, proc)
   raise 'Command message must have one or two arguments.' unless (1..2).include?(args.length)
 
   rights = args.length == 2 ? args[1] : RIGHTS_STANDARD
-  $ctx.add_command_listener(args[0].to_s, ProcCommandListener.new(rights, proc))
+  PluginContext::add_command_listener(args[0].to_s, ProcCommandListener.new(rights, proc))
 end
 
 # Defines an action to be taken upon login.
 def on_login(proc)
-  $ctx.add_login_listener(ProcLoginListener.new(proc))
+  PluginContext::add_login_listener(ProcLoginListener.new(proc))
 end
 
 # Defines an action to be taken upon logout.
 def on_logout(proc)
-  $ctx.add_logout_listener(ProcLogoutListener.new(proc))
+  PluginContext::add_logout_listener(ProcLogoutListener.new(proc))
 end
 
 # Ids of in-game skills.
diff --git a/data/plugins/skill/runecraft/rune.rb b/data/plugins/skill/runecraft/rune.rb
index 527dfafb..4565c9d6 100644
--- a/data/plugins/skill/runecraft/rune.rb
+++ b/data/plugins/skill/runecraft/rune.rb
@@ -11,7 +11,7 @@ class Rune
   
   def initialize(id, level, experience, multiplier)
     @id = id
-    @name = ItemDefinition.lookup(id).name.downcase
+    @name = ItemDefinition.lookup(id).name.to_s.downcase
     @level = level
     @experience = experience
     @multiplier = multiplier
diff --git a/data/plugins/skill/runecraft/tiara.rb b/data/plugins/skill/runecraft/tiara.rb
index 02df9dbd..cd0b5c22 100644
--- a/data/plugins/skill/runecraft/tiara.rb
+++ b/data/plugins/skill/runecraft/tiara.rb
@@ -18,7 +18,7 @@ class Tiara
 
   def initialize(tiara_id, altar, talisman, bitshift, experience)
       @tiara_id = tiara_id
-      @name = ItemDefinition.lookup(tiara_id).name.downcase
+      @name = ItemDefinition.lookup(tiara_id).name.to_s.downcase
       @altar = altar
       @talisman = talisman
       @bitshift = bitshift
diff --git a/src/org/apollo/util/plugin/PluginContext.java b/src/org/apollo/util/plugin/PluginContext.java
index c9d78686..8d88f9f1 100644
--- a/src/org/apollo/util/plugin/PluginContext.java
+++ b/src/org/apollo/util/plugin/PluginContext.java
@@ -19,6 +19,8 @@ import org.apollo.game.model.World;
  */
 public final class PluginContext {
 
+	// TODO move listeners to world?
+
 	/**
 	 * Adds a {@link CommandListener}.
 	 *