diff --git a/src/objects/objects.py b/src/objects/objects.py
index 416d3d69d4..0744216fdc 100644
--- a/src/objects/objects.py
+++ b/src/objects/objects.py
@@ -289,8 +289,7 @@ class DefaultObject(ObjectDB):
         return self.db_player and self.db_player.is_superuser \
                 and not self.db_player.attributes.get("_quell")
 
-    @property
-    def contents(self):
+    def contents_get(self, exclude=None):
         """
         Returns the contents of this object, i.e. all
         objects that has this object set as its location.
@@ -298,7 +297,9 @@ class DefaultObject(ObjectDB):
 
         exclude is one or more objects to not return
         """
-        return ObjectDB.objects.get_contents(self)
+        return ObjectDB.objects.get_contents(self, excludeobj=exclude)
+    contents = property(contents_get)
+
 
     @property
     def exits(self):
diff --git a/src/players/player.py b/src/players/player.py
index 4a160a4d08..644316ee72 100644
--- a/src/players/player.py
+++ b/src/players/player.py
@@ -221,9 +221,9 @@ class DefaultPlayer(PlayerDB):
             return False
         # do the disconnect, but only if we are the last session to puppet
         obj.at_pre_unpuppet()
-        obj.dbobj.sessid.remove(sessid)
-        if not obj.dbobj.sessid.count():
-            del obj.dbobj.player
+        obj.sessid.remove(sessid)
+        if not obj.sessid.count():
+            del obj.player
             obj.at_post_unpuppet(self, sessid=sessid)
         session.puppet = None
         session.puid = None
@@ -244,7 +244,6 @@ class DefaultPlayer(PlayerDB):
         player's end.
 
         sessid - return character connected to this sessid,
-        character - return character if connected to this player, else None.
 
         """
         session = self.get_session(sessid)
diff --git a/src/typeclasses/models.py b/src/typeclasses/models.py
index 7a98390e40..79f794165e 100644
--- a/src/typeclasses/models.py
+++ b/src/typeclasses/models.py
@@ -286,7 +286,7 @@ class TypedObject(SharedMemoryModel):
         """
         Returns the object's dbref on the form #NN.
         """
-        return "#%s" % GA(self, "_TypedObject__dbid_get")()
+        return "#%s" % self.dbid
 
     def __dbref_set(self):
         raise Exception("dbref cannot be set!")