diff --git a/README.md b/README.md
index 6c14f5f..e5a5470 100644
--- a/README.md
+++ b/README.md
@@ -88,10 +88,10 @@ See the "Known Issues" section for details.
 
 ## Benchmark Results on RISCV
 
-| Program | w2c2<br>-O0 | w2c2<br>-O3 | wasmtime | wasmer<br>(cranelift) | wasmer<br>(llvm) | WAMR<br>-O0 | WAMR<br>-O3 | directly |
+| Program | w2c2<br>-O0 | w2c2<br>-O3 | wasmtime | wasmer<br>(cranelift) | wasmer<br>(llvm) | WAMR<br>-O3 | WAMR<br>-O3 | directly |
 |---|---|---|---|---|---|---|---|---|
-| `reva-client-eth` (Rust) | 4,543,397,058 | 1,337,696,305 | 1,074,488,397 | doesn't work | ? | 2,472,559,016 | ? | 388,564,723 |
-| `stateless` (Go) | 6,039,298,186 | 2,154,036,727 | 874,758,419 | 953,874,491 | ? | 3,526,934,350 | ? | 236,265,327 |
+| `reva-client-eth` (Rust) | 4,543,397,058 | 1,337,696,305 | 1,074,488,397 | doesn't work | ? | 1,944,993,041 | ? | 388,564,723 |
+| `stateless` (Go) | 6,039,298,186 | 2,154,036,727 | 874,758,419 | 953,874,491 | ? | 2,324,683,355 | ? | 236,265,327 |
 
 ## Analysis
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0942eb4..b7b2029 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -43,6 +43,7 @@ RUN apt-get update && apt-get install -y \
     libpixman-1-dev \
     wget \
     jq \
+    binaryen \
     && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update && apt-get install -y \
diff --git a/platform/riscv-wamr-qemu/scripts/wasm2wamr-qemu.sh b/platform/riscv-wamr-qemu/scripts/wasm2wamr-qemu.sh
index af7e834..d140af3 100755
--- a/platform/riscv-wamr-qemu/scripts/wasm2wamr-qemu.sh
+++ b/platform/riscv-wamr-qemu/scripts/wasm2wamr-qemu.sh
@@ -17,7 +17,7 @@ PATH=$WAMR_ROOT/bin/:$PATH
 if [ $# -lt 2 ]; then
     echo "Usage: $0 <guest-c-package-dir> <output-elf>"
     echo ""
-    echo "Compiles a C package (from w2c2) to WAMR-based RISC-V binary for QEMU virt machine."
+    echo "Compiles WASM to WAMR-based RISC-V binary for QEMU virt machine."
     echo ""
     echo "Arguments:"
     echo "  guest-c-package-dir  Directory containing guest.c, guest.h, w2c2_base.h"
@@ -93,7 +93,7 @@ wamrc \
     --opt-level=3 \
     --size-level=0 \
     --bounds-checks=0 \
-    -o $OUTPUT.riscv64.wamr $1
+    -o $OUTPUT.riscv64.wamr.aot $1
 
 gcc platform/riscv-wamr-qemu/file2c/file2c.c \
     -o platform/riscv-wamr-qemu/file2c/file2c
@@ -104,7 +104,7 @@ gcc platform/riscv-wamr-qemu/file2c/file2c.c \
 #
 # https://github.com/bytecodealliance/wasm-micro-runtime/blob/main/core/iwasm/include/wasm_export.h
 platform/riscv-wamr-qemu/file2c/file2c \
-    $OUTPUT.riscv64.wamr \
+    $OUTPUT.riscv64.wamr.aot \
     wasmModuleBuffer > $OUTPUT.riscv64.wamr.c
 
 # Compile everything in one command via Docker