diff --git a/evennia/contrib/__init__.py b/evennia/contrib/__init__.py
index 35d571236e..f7f49437ad 100644
--- a/evennia/contrib/__init__.py
+++ b/evennia/contrib/__init__.py
@@ -6,6 +6,8 @@ useful but are deemed too game-specific to go into the core library.
 See README.md for more info.
 """
 # imports for apidoc
+import evennia
+evennia._init()
 import barter, dice, extended_room, menu_login, talking_npc
-import chargen, email-login, genderub, lineeditor, menusystem, slow_exit
+import chargen, email_login, gendersub, lineeditor, menusystem, slow_exit
 import tutorial_world, tutorial_examples
diff --git a/evennia/contrib/barter.py b/evennia/contrib/barter.py
index 5e4feb8625..1fd5a51f76 100644
--- a/evennia/contrib/barter.py
+++ b/evennia/contrib/barter.py
@@ -94,12 +94,12 @@ in-game.
 
 """
 
-from evennia import Command, Script, CmdSet
+from evennia import Command, DefaultScript, CmdSet
 
 TRADE_TIMEOUT = 60  # timeout for B to accept trade
 
 
-class TradeTimeout(Script):
+class TradeTimeout(DefaultScript):
     """
     This times out the trade request, in case player B did not reply in time.
     """
diff --git a/evennia/contrib/chargen.py b/evennia/contrib/chargen.py
index 98a6471125..6f470873ed 100644
--- a/evennia/contrib/chargen.py
+++ b/evennia/contrib/chargen.py
@@ -184,7 +184,7 @@ class CmdOOCCharacterCreate(Command):
         self.caller.msg("{gThe Character {c%s{g was successfully created!" % charname)
 
 
-class OOCCmdSetCharGen(default_cmds.OOCCmdSet):
+class OOCCmdSetCharGen(default_cmds.PlayerCmdSet):
     """
     Extends the default OOC cmdset.
     """
diff --git a/evennia/contrib/extended_room.py b/evennia/contrib/extended_room.py
index e2321709ba..076e8fb1f5 100644
--- a/evennia/contrib/extended_room.py
+++ b/evennia/contrib/extended_room.py
@@ -69,7 +69,7 @@ Installation/testing:
 
 import re
 from django.conf import settings
-from evennia import Room
+from evennia import DefaultRoom
 from evennia import gametime
 from evennia import default_cmds
 from evennia import utils
@@ -100,7 +100,7 @@ DAY_BOUNDARIES = (0, 6 / 24.0, 12 / 24.0, 18 / 24.0)
 
 # implements the Extended Room
 
-class ExtendedRoom(Room):
+class ExtendedRoom(DefaultRoom):
     """
     This room implements a more advanced look functionality depending on
     time. It also allows for "details", together with a slightly modified
diff --git a/evennia/contrib/slow_exit.py b/evennia/contrib/slow_exit.py
index 19067df87b..e1804bc761 100644
--- a/evennia/contrib/slow_exit.py
+++ b/evennia/contrib/slow_exit.py
@@ -36,14 +36,14 @@ TickerHandler might be better.
 
 """
 
-from evennia import Exit, utils, Command
+from evennia import DefaultExit, utils, Command
 
 MOVE_DELAY = {"stroll": 6,
               "walk": 4,
               "run": 2,
               "sprint": 1}
 
-class SlowExit(Exit):
+class SlowExit(DefaultExit):
     """
     This overloads the way moving happens.
     """
diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py
index 5e58f8c77e..3496d48396 100644
--- a/evennia/utils/utils.py
+++ b/evennia/utils/utils.py
@@ -74,7 +74,7 @@ fill = wrap
 def pad(text, width=78, align="c", fillchar=" "):
     """
     Pads to a given width, align is one of c,l,r
-    and fillchar defaults to the empty string
+    and fillchar defaults to the space character.
     """
     align = align if align in ('c', 'l', 'r') else 'c'
     fillchar = fillchar[0] if fillchar else " "