diff --git a/plugins/Babelfish/config.py b/plugins/Babelfish/config.py
index b6eb1b0d5..914c7dab2 100644
--- a/plugins/Babelfish/config.py
+++ b/plugins/Babelfish/config.py
@@ -30,6 +30,8 @@
 import supybot.conf as conf
 import supybot.registry as registry
 
+import babelfish
+
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
     # a bool that specifies whether the user identified himself as an advanced
@@ -44,7 +46,7 @@ class Languages(registry.OnlySomeStrings):
     normalize = staticmethod(str.capitalize)
 
 class SpaceSeparatedListOfLanguages(registry.SeparatedListOf):
-    List = sets.Set
+    List = set
     Value = Languages
     def splitter(self, s):
         return s.split()
diff --git a/plugins/Babelfish/plugin.py b/plugins/Babelfish/plugin.py
index fe5ddcc7a..6095d50dc 100644
--- a/plugins/Babelfish/plugin.py
+++ b/plugins/Babelfish/plugin.py
@@ -43,7 +43,7 @@ import supybot.callbacks as callbacks
 
 class Babelfish(callbacks.Privmsg):
     threaded = True
-    _abbrevs = utils.abbrev(imap(str.lower, babelfish.available_languages))
+    _abbrevs = utils.abbrev(map(str.lower, babelfish.available_languages))
     _abbrevs['de'] = 'german'
     _abbrevs['jp'] = 'japanese'
     _abbrevs['kr'] = 'korean'
diff --git a/plugins/Babelfish/test.py b/plugins/Babelfish/test.py
index d88c6cdc2..b1422d117 100644
--- a/plugins/Babelfish/test.py
+++ b/plugins/Babelfish/test.py
@@ -29,7 +29,7 @@
 
 from supybot.test import *
 
-class BabelFishTestCase(PluginTestCase, PluginDocumentation):
+class BabelFishTestCase(PluginTestCase):
     plugins = ('Babelfish',)
     if network:
         def testTranslate(self):
diff --git a/setup.py b/setup.py
index 1077884d7..5401ce59e 100644
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,7 @@
 
 plugins = [
     'Admin',
+    'Babelfish',
     'Channel',
     'Config',
     'Dict',