diff --git a/ecdsa/src/gadgets/curve_fixed_base.rs b/ecdsa/src/gadgets/curve_fixed_base.rs
index 8d675d12..d99d5760 100644
--- a/ecdsa/src/gadgets/curve_fixed_base.rs
+++ b/ecdsa/src/gadgets/curve_fixed_base.rs
@@ -40,14 +40,18 @@ pub fn fixed_base_curve_mul_circuit<C: Curve, F: RichField + Extendable<D>, cons
     // `s * P = sum s_i * P_i` with `P_i = (16^i) * P` and `s = sum s_i * (16^i)`.
     for (limb, point) in limbs.into_iter().zip(scaled_base) {
         // `muls_point[t] = t * P_i` for `t=0..16`.
-        let muls_point = (0..16)
+        let mut muls_point = (0..16)
             .scan(AffinePoint::ZERO, |acc, _| {
                 let tmp = *acc;
                 *acc = (point + *acc).to_affine();
                 Some(tmp)
             })
+            // First element if zero, so we skip it since `constant_affine_point` takes non-zero input.
+            .skip(1)
             .map(|p| builder.constant_affine_point(p))
             .collect::<Vec<_>>();
+        // We add back a point in position 0. `limb == zero` is checked below, so this point can be arbitrary.
+        muls_point.insert(0, muls_point[0].clone());
         let is_zero = builder.is_equal(limb, zero);
         let should_add = builder.not(is_zero);
         // `r = s_i * P_i`
diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs
index 1cf61255..1f8ba0da 100644
--- a/evm/src/cpu/kernel/aggregator.rs
+++ b/evm/src/cpu/kernel/aggregator.rs
@@ -50,8 +50,8 @@ pub(crate) fn combined_kernel() -> Kernel {
         include_str!("asm/rlp/encode.asm"),
         include_str!("asm/rlp/decode.asm"),
         include_str!("asm/rlp/read_to_memory.asm"),
-        include_str!("asm/storage_read.asm"),
-        include_str!("asm/storage_write.asm"),
+        include_str!("asm/storage/read.asm"),
+        include_str!("asm/storage/write.asm"),
         include_str!("asm/transactions/process_normalized.asm"),
         include_str!("asm/transactions/router.asm"),
         include_str!("asm/transactions/type_0.asm"),
diff --git a/evm/src/cpu/kernel/asm/storage/read.asm b/evm/src/cpu/kernel/asm/storage/read.asm
new file mode 100644
index 00000000..04fea17a
--- /dev/null
+++ b/evm/src/cpu/kernel/asm/storage/read.asm
@@ -0,0 +1,2 @@
+global storage_read:
+    // TODO
diff --git a/evm/src/cpu/kernel/asm/storage/write.asm b/evm/src/cpu/kernel/asm/storage/write.asm
new file mode 100644
index 00000000..940fb548
--- /dev/null
+++ b/evm/src/cpu/kernel/asm/storage/write.asm
@@ -0,0 +1,2 @@
+global storage_write:
+    // TODO
diff --git a/evm/src/cpu/kernel/asm/storage_read.asm b/evm/src/cpu/kernel/asm/storage_read.asm
deleted file mode 100644
index 6a704c61..00000000
--- a/evm/src/cpu/kernel/asm/storage_read.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-// TODO: Dummy code for now.
-global storage_read:
-    JUMPDEST
-    PUSH 1234
-    POP
-    // An infinite loop:
-mylabel:
-    JUMPDEST
-    PUSH mylabel
-    JUMP
diff --git a/evm/src/cpu/kernel/asm/storage_write.asm b/evm/src/cpu/kernel/asm/storage_write.asm
deleted file mode 100644
index 15c41b7c..00000000
--- a/evm/src/cpu/kernel/asm/storage_write.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-// TODO: Dummy code for now.
-global storage_write:
-    JUMPDEST
-    PUSH 123 // Whatever.
-    POP
-    BYTES 0x1, 0x02, 3