diff --git a/CMakeLists.txt b/CMakeLists.txt
index db1e726..e2b649d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,7 +296,7 @@ target_include_directories(amduat_pel_build
   PRIVATE ${AMDUAT_INCLUDE_DIR}
 )
 target_link_libraries(amduat_pel_build
-  PRIVATE amduat_pel amduat_asl amduat_enc amduat_util
+  PRIVATE amduat_pel amduat_asl_store_fs amduat_asl amduat_enc amduat_util
 )
 set_target_properties(amduat_pel_build PROPERTIES OUTPUT_NAME amduat-pel-build)
 
@@ -330,7 +330,8 @@ target_include_directories(amduat_test_pel_program_build_concat
   PRIVATE ${AMDUAT_INCLUDE_DIR}
 )
 target_link_libraries(amduat_test_pel_program_build_concat
-  PRIVATE amduat_pel amduat_asl amduat_enc amduat_hash_asl1 amduat_util
+  PRIVATE amduat_pel amduat_asl_store_fs amduat_asl amduat_enc
+          amduat_hash_asl1 amduat_util
 )
 add_test(NAME pel_program_build_concat COMMAND amduat_test_pel_program_build_concat)
 
@@ -536,7 +537,7 @@ target_include_directories(amduat_test_pel_program_dag_exec
   PRIVATE ${AMDUAT_INCLUDE_DIR}
 )
 target_link_libraries(amduat_test_pel_program_dag_exec
-  PRIVATE amduat_pel
+  PRIVATE amduat_pel amduat_asl_store_fs
 )
 add_test(NAME pel_program_dag_exec COMMAND amduat_test_pel_program_dag_exec)
 
@@ -568,7 +569,7 @@ target_include_directories(amduat_test_pel_surf_run
   PRIVATE ${AMDUAT_INCLUDE_DIR}
 )
 target_link_libraries(amduat_test_pel_surf_run
-  PRIVATE amduat_pel
+  PRIVATE amduat_pel amduat_asl_store_fs
 )
 add_test(NAME pel_surf_run COMMAND amduat_test_pel_surf_run)
 
diff --git a/src/core/derivation_sid.c b/src/core/derivation_sid.c
index d5d20cd..cf063b3 100644
--- a/src/core/derivation_sid.c
+++ b/src/core/derivation_sid.c
@@ -74,8 +74,7 @@ bool amduat_pel_derivation_sid_compute(
     /* ReferenceBytes are self-delimiting because hash_id implies digest_len. */
     ok = amduat_enc_asl1_core_encode_reference_v1(in->program_ref, &ref_bytes);
     if (!ok ||
-        !amduat_hash_asl1_stream_update(&stream, ref_bytes.data,
-                                        ref_bytes.len)) {
+        !amduat_hash_asl1_stream_update(&stream, ref_bytes)) {
       amduat_hash_asl1_stream_destroy(&stream);
       free((void *)ref_bytes.data);
       return false;
@@ -88,8 +87,7 @@ bool amduat_pel_derivation_sid_compute(
     bool ok = amduat_enc_asl1_core_encode_reference_v1(in->input_refs[i],
                                                        &ref_bytes);
     if (!ok ||
-        !amduat_hash_asl1_stream_update(&stream, ref_bytes.data,
-                                        ref_bytes.len)) {
+        !amduat_hash_asl1_stream_update(&stream, ref_bytes)) {
       amduat_hash_asl1_stream_destroy(&stream);
       free((void *)ref_bytes.data);
       return false;
@@ -98,7 +96,8 @@ bool amduat_pel_derivation_sid_compute(
   }
 
   marker = in->has_params_ref ? 0x01u : 0x00u;
-  if (!amduat_hash_asl1_stream_update(&stream, &marker, 1u)) {
+  if (!amduat_hash_asl1_stream_update(&stream,
+                                      amduat_octets(&marker, 1u))) {
     amduat_hash_asl1_stream_destroy(&stream);
     return false;
   }
@@ -107,8 +106,7 @@ bool amduat_pel_derivation_sid_compute(
     bool ok = amduat_enc_asl1_core_encode_reference_v1(in->params_ref,
                                                        &ref_bytes);
     if (!ok ||
-        !amduat_hash_asl1_stream_update(&stream, ref_bytes.data,
-                                        ref_bytes.len)) {
+        !amduat_hash_asl1_stream_update(&stream, ref_bytes)) {
       amduat_hash_asl1_stream_destroy(&stream);
       free((void *)ref_bytes.data);
       return false;
@@ -118,7 +116,8 @@ bool amduat_pel_derivation_sid_compute(
 
   /* ExecProfile is currently absent; presence must be explicitly marked. */
   marker = in->has_exec_profile ? 0x01u : 0x00u;
-  if (!amduat_hash_asl1_stream_update(&stream, &marker, 1u)) {
+  if (!amduat_hash_asl1_stream_update(&stream,
+                                      amduat_octets(&marker, 1u))) {
     amduat_hash_asl1_stream_destroy(&stream);
     return false;
   }
@@ -127,8 +126,7 @@ bool amduat_pel_derivation_sid_compute(
       amduat_hash_asl1_stream_destroy(&stream);
       return false;
     }
-    if (!amduat_hash_asl1_stream_update(&stream, in->exec_profile.data,
-                                        in->exec_profile.len)) {
+    if (!amduat_hash_asl1_stream_update(&stream, in->exec_profile)) {
       amduat_hash_asl1_stream_destroy(&stream);
       return false;
     }
diff --git a/src/tools/amduat_pel_cli.c b/src/tools/amduat_pel_cli.c
index 95bd132..679c1be 100644
--- a/src/tools/amduat_pel_cli.c
+++ b/src/tools/amduat_pel_cli.c
@@ -3,6 +3,8 @@
 #include "amduat/asl/asl_materialization_cache_fs.h"
 #include "amduat/asl/asl_pointer_fs.h"
 #include "amduat/asl/log_store.h"
+#include "amduat/asl/collection.h"
+#include "amduat/asl/record.h"
 #include "amduat/asl/asl_store_fs.h"
 #include "amduat/asl/asl_store_fs_meta.h"
 #include "amduat/asl/io.h"