diff --git a/src/commands/default/tests.py b/src/commands/default/tests.py
index 664e5be882..75336cdf01 100644
--- a/src/commands/default/tests.py
+++ b/src/commands/default/tests.py
@@ -232,7 +232,7 @@ from src.commands.default import building
 class TestBuilding(CommandTest):
     CID = 6
     def test_cmds(self):
-        self.call(building.CmdCreate(), "/drop TestObj1", "You create a new Object: TestObj1.")
+        self.call(building.CmdCreate(), "/drop TestObj1", "You create a new DefaultObject: TestObj1.")
         self.call(building.CmdExamine(), "TestObj1", "Name/key: TestObj1")
         self.call(building.CmdSetObjAlias(), "TestObj1 = TestObj1b","Alias(es) for 'TestObj1' set to testobj1b.")
         self.call(building.CmdCopy(), "TestObj1 = TestObj2;TestObj2b, TestObj3;TestObj3b", "Copied TestObj1 to 'TestObj3' (aliases: ['TestObj3b']")
diff --git a/src/comms/managers.py b/src/comms/managers.py
index 4a2b08f114..fe00a81854 100644
--- a/src/comms/managers.py
+++ b/src/comms/managers.py
@@ -300,7 +300,7 @@ class ChannelDBManager(TypedObjectManager):
         """
         Return all channels a given player is subscribed to
         """
-        return player.__dbclass__.subscription_set.all()
+        return player.player.subscription_set.all()
 
     @returns_typeclass_list
     def channel_search(self, ostring, exact=True):
diff --git a/src/typeclasses/models.py b/src/typeclasses/models.py
index 3fabdd1e5e..8f2ebe23a8 100644
--- a/src/typeclasses/models.py
+++ b/src/typeclasses/models.py
@@ -94,7 +94,7 @@ class TypeclassBase(SharedMemoryModelBase):
         """
 
         # storage of stats
-        attrs["typename"] = cls.__name__
+        attrs["typename"] = name#cls.__name__
         attrs["path"] =  "%s.%s" % (attrs["__module__"], name)
 
         # typeclass proxy setup
diff --git a/src/utils/idmapper/base.py b/src/utils/idmapper/base.py
index 8b7957191d..0c82f7118d 100755
--- a/src/utils/idmapper/base.py
+++ b/src/utils/idmapper/base.py
@@ -187,6 +187,7 @@ class SharedMemoryModelBase(ModelBase):
         for fieldname, field in ((fname, field) for fname, field in attrs.items()
                                   if fname.startswith("db_") and type(field).__name__ != "ManyToManyField"):
             foreignkey = type(field).__name__ == "ForeignKey"
+            #print fieldname, type(field).__name__, field
             wrappername = "dbid" if fieldname == "id" else fieldname.replace("db_", "", 1)
             #print fieldname, wrappername
             if wrappername not in attrs: