diff --git a/model_util/util.c b/model_util/util.c
index 187a66a..4833243 100644
--- a/model_util/util.c
+++ b/model_util/util.c
@@ -226,7 +226,7 @@
       result = iree_hal_buffer_map_range(
           iree_hal_buffer_view_buffer(ret_buffer_view),
           IREE_HAL_MAPPING_MODE_SCOPED, IREE_HAL_MEMORY_ACCESS_READ, 0,
-          IREE_HAL_WHOLE_BUFFER, &mapped_memories[index_output]);
+          IREE_WHOLE_BUFFER, &mapped_memories[index_output]);
     }
 
     if (iree_status_is_ok(result)) {
diff --git a/samples/microbenchmarks/conv1x1_test.c b/samples/microbenchmarks/conv1x1_test.c
index 9b9ab45..9188a33 100644
--- a/samples/microbenchmarks/conv1x1_test.c
+++ b/samples/microbenchmarks/conv1x1_test.c
@@ -45,7 +45,7 @@
 
 #if !defined(BUILD_VMVX)
 iree_hal_executable_library_query_fn_t library_query(void) {
-  return conv1x1_test_linked_llvm_cpu_library_query;
+  return conv1x1_test_linked_library_query;
 }
 #endif