diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
index f3f15088a..df0517377 100644
--- a/system-contracts/contracts/EvmEmulator.yul
+++ b/system-contracts/contracts/EvmEmulator.yul
@@ -311,7 +311,6 @@ object "EvmEmulator" {
             swapActivePointerWithBytecodePointer()
             opcode := shr(248, activePointerLoad(ip))
             swapActivePointerWithBytecodePointer()
-            // STOP else
         }
         
         // It is the responsibility of the caller to ensure that start and length is correct
@@ -337,7 +336,7 @@ object "EvmEmulator" {
         }
         
         function swapActivePointerWithBytecodePointer() {
-            verbatim_2i_0o("active_ptr_swap", 0, 4)
+            verbatim_2i_0o("active_ptr_swap", 0, 2)
         }
         
         function activePointerLoad(pos) -> res {
@@ -2122,7 +2121,7 @@ object "EvmEmulator" {
                     let counter
                     counter, sp, stackHead := popStackItem(sp, stackHead)
             
-                    // Counter certainly can't be bigger than uint64.
+                    // Counter certainly can't be bigger than uint32.
                     if gt(counter, MAX_UINT32()) {
                         panic()
                     } 
@@ -2152,7 +2151,7 @@ object "EvmEmulator" {
                         continue
                     }
             
-                    // Counter certainly can't be bigger than uint64.
+                    // Counter certainly can't be bigger than uint32.
                     if gt(counter, MAX_UINT32()) {
                         panic()
                     } 
@@ -3242,7 +3241,6 @@ object "EvmEmulator" {
                 swapActivePointerWithBytecodePointer()
                 opcode := shr(248, activePointerLoad(ip))
                 swapActivePointerWithBytecodePointer()
-                // STOP else
             }
             
             // It is the responsibility of the caller to ensure that start and length is correct
@@ -3268,7 +3266,7 @@ object "EvmEmulator" {
             }
             
             function swapActivePointerWithBytecodePointer() {
-                verbatim_2i_0o("active_ptr_swap", 0, 4)
+                verbatim_2i_0o("active_ptr_swap", 0, 2)
             }
             
             function activePointerLoad(pos) -> res {
@@ -5041,7 +5039,7 @@ object "EvmEmulator" {
                         let counter
                         counter, sp, stackHead := popStackItem(sp, stackHead)
                 
-                        // Counter certainly can't be bigger than uint64.
+                        // Counter certainly can't be bigger than uint32.
                         if gt(counter, MAX_UINT32()) {
                             panic()
                         } 
@@ -5071,7 +5069,7 @@ object "EvmEmulator" {
                             continue
                         }
                 
-                        // Counter certainly can't be bigger than uint64.
+                        // Counter certainly can't be bigger than uint32.
                         if gt(counter, MAX_UINT32()) {
                             panic()
                         } 
diff --git a/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul b/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul
index 6d5656bd0..8c998b677 100644
--- a/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul
+++ b/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul
@@ -774,7 +774,7 @@ for { } true { } {
         let counter
         counter, sp, stackHead := popStackItem(sp, stackHead)
 
-        // Counter certainly can't be bigger than uint64.
+        // Counter certainly can't be bigger than uint32.
         if gt(counter, MAX_UINT32()) {
             panic()
         } 
@@ -804,7 +804,7 @@ for { } true { } {
             continue
         }
 
-        // Counter certainly can't be bigger than uint64.
+        // Counter certainly can't be bigger than uint32.
         if gt(counter, MAX_UINT32()) {
             panic()
         }