diff --git a/bin/Index/Persist.cpp b/bin/Index/Persist.cpp
index 7dff27d1d..699028eed 100644
--- a/bin/Index/Persist.cpp
+++ b/bin/Index/Persist.cpp
@@ -910,11 +910,13 @@ void GlobalIndexingState::PersistFragment(
 
     // Associate the range of file tokens with the fragment. This helps with
     // implementing things like regular expression (via RE2) searches over code.
-    database.AddAsync(
-        mx::FragmentFileRangeRecord{
-            pf.fragment_id,
-            pf.file_location->first_file_token_id,
-            pf.file_location->last_file_token_id});
+    if (!pf.raw_parent_entity) {
+      database.AddAsync(
+          mx::FragmentFileRangeRecord{
+              pf.fragment_id,
+              pf.file_location->first_file_token_id,
+              pf.file_location->last_file_token_id});
+    }
   }
 
   auto tlds = fb.initTopLevelDeclarations(pf.num_top_level_declarations);
diff --git a/cmake/vast.cmake b/cmake/vast.cmake
index e9703db89..747071178 100644
--- a/cmake/vast.cmake
+++ b/cmake/vast.cmake
@@ -13,4 +13,5 @@ set(VAST_LIBS
   VAST::VASTCodeGen
   VAST::VASTFrontend
   VAST::VASTSymbolInterface
+  VAST::VASTAggregateTypeDefinitionInterface
 )