diff --git a/bddl/knowledge_base/models.py b/bddl/knowledge_base/models.py
index b0c35d56..8f349e31 100644
--- a/bddl/knowledge_base/models.py
+++ b/bddl/knowledge_base/models.py
@@ -102,7 +102,7 @@ def room_count(self):
     @cached_property
     def object_count(self):
         return sum(
-            roomobject.object_count
+            roomobject.count
             for room in self.rooms
             for roomobject in room.roomobjects
             if not room.ready
@@ -115,7 +115,7 @@ def any_ready(self):
     @cached_property
     def fully_ready(self):
         ready_count = sum(
-            roomobject.object_count
+            roomobject.count
             for room in self.rooms
             for roomobject in room.roomobjects
             if room.ready
@@ -482,7 +482,7 @@ def synset_state(self) -> str:
             return STATE_UNMATCHED
         elif any(synset.state == STATE_UNMATCHED for synset in self.synsets):
             return STATE_UNMATCHED
-        elif any(synset.state == STATE_MATCHED for synset in self.synsets):
+        elif any(synset.state == STATE_PLANNED for synset in self.synsets):
             return STATE_PLANNED
         else:
             return STATE_MATCHED