diff --git a/aquadoggo/src/db/stores/blob.rs b/aquadoggo/src/db/stores/blob.rs
index fa00b13de..2eb95ddcf 100644
--- a/aquadoggo/src/db/stores/blob.rs
+++ b/aquadoggo/src/db/stores/blob.rs
@@ -131,9 +131,15 @@ impl SqlStore {
                 FROM 
                     document_view_fields
                 LEFT JOIN 
-                    {OPERATION_FIELDS}
+                    operation_fields_v1
+                ON
+                    document_view_fields.operation_id = operation_fields_v1.operation_id
+                AND
+                    document_view_fields.name = operation_fields_v1.name
                 LEFT JOIN 
-                    {DOCUMENT_VIEWS}
+                    document_views
+                ON
+                    document_view_fields.document_view_id = document_views.document_view_id
                 WHERE
                     operation_fields_v1.field_type IN ('pinned_relation', 'pinned_relation_list', 'relation_list', 'relation')
                 AND 
diff --git a/aquadoggo/src/replication/manager.rs b/aquadoggo/src/replication/manager.rs
index 528ff7530..6ef8d2eb9 100644
--- a/aquadoggo/src/replication/manager.rs
+++ b/aquadoggo/src/replication/manager.rs
@@ -695,7 +695,6 @@ mod tests {
         test_runner(move |node: TestNode| async move {
             let mode = Mode::LogHeight;
             let (tx, _rx) = broadcast::channel(8);
-            let schema_provider = SchemaProvider::default();
             let ingest = SyncIngest::new(SchemaProvider::default(), tx);
 
             // Sanity check: Id of peer A is < id of peer B.
diff --git a/aquadoggo/src/replication/strategies/log_height.rs b/aquadoggo/src/replication/strategies/log_height.rs
index 1291db5bd..4673a2600 100644
--- a/aquadoggo/src/replication/strategies/log_height.rs
+++ b/aquadoggo/src/replication/strategies/log_height.rs
@@ -668,7 +668,7 @@ mod tests {
             )
             .await;
 
-            let target_set = TargetSet::new(&target_set_schema);
+            let target_set = SchemaIdSet::new(&target_set_schema);
             let _ = node_a.context.schema_provider.update(schema).await;
 
             let strategy_a =