diff --git a/std/assembly/array.ts b/std/assembly/array.ts
index 57b3133260..dfaf90df41 100644
--- a/std/assembly/array.ts
+++ b/std/assembly/array.ts
@@ -41,7 +41,7 @@ export class Array<T> {
 
   private buffer: ArrayBuffer;
   @unsafe readonly dataStart: usize;
-  private byteLength: i32;
+  private byteLength: i32; // Uses here as capacity
 
   // Also note that Array<T> with non-nullable T must guard against uninitialized null values
   // whenever an element is accessed. Otherwise, the compiler wouldn't be able to guarantee
@@ -63,7 +63,7 @@ export class Array<T> {
   constructor(length: i32 = 0) {
     if (<u32>length > <u32>BLOCK_MAXSIZE >>> alignof<T>()) throw new RangeError(E_INVALIDLENGTH);
     // reserve capacity for at least MIN_SIZE elements
-    var bufferSize = <usize>max(length, MIN_SIZE) << alignof<T>();
+    var bufferSize = max(<usize>length, MIN_SIZE) << alignof<T>();
     var buffer = changetype<ArrayBuffer>(__new(bufferSize, idof<ArrayBuffer>()));
     memory.fill(changetype<usize>(buffer), 0, bufferSize);
     this.buffer = buffer; // links
diff --git a/tests/compiler/class.untouched.wat b/tests/compiler/class.untouched.wat
index 1cb0bf14ed..2e5c230a4d 100644
--- a/tests/compiler/class.untouched.wat
+++ b/tests/compiler/class.untouched.wat
@@ -2734,7 +2734,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
diff --git a/tests/compiler/issues/1699.untouched.wat b/tests/compiler/issues/1699.untouched.wat
index d06717ff9d..47b4298932 100644
--- a/tests/compiler/issues/1699.untouched.wat
+++ b/tests/compiler/issues/1699.untouched.wat
@@ -4204,7 +4204,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
diff --git a/tests/compiler/std-wasi/process.optimized.wat b/tests/compiler/std-wasi/process.optimized.wat
index 3acfd49e00..97ea52e086 100644
--- a/tests/compiler/std-wasi/process.optimized.wat
+++ b/tests/compiler/std-wasi/process.optimized.wat
@@ -4739,7 +4739,7 @@
   i32.const 8
   local.get $0
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
diff --git a/tests/compiler/std-wasi/process.untouched.wat b/tests/compiler/std-wasi/process.untouched.wat
index e3b72e07f2..061e79a721 100644
--- a/tests/compiler/std-wasi/process.untouched.wat
+++ b/tests/compiler/std-wasi/process.untouched.wat
@@ -7723,7 +7723,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
diff --git a/tests/compiler/std/array.optimized.wat b/tests/compiler/std/array.optimized.wat
index 66c304b39f..f3ebf3f399 100644
--- a/tests/compiler/std/array.optimized.wat
+++ b/tests/compiler/std/array.optimized.wat
@@ -8559,7 +8559,7 @@
   i32.const 8
   local.get $1
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -8676,7 +8676,7 @@
   i32.const 8
   local.get $1
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   local.tee $3
   i32.const 0
@@ -18608,7 +18608,7 @@
   i32.const 8
   local.get $0
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -19666,7 +19666,7 @@
   i32.const 8
   local.get $1
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
diff --git a/tests/compiler/std/array.untouched.wat b/tests/compiler/std/array.untouched.wat
index 455156bb95..838c828d16 100644
--- a/tests/compiler/std/array.untouched.wat
+++ b/tests/compiler/std/array.untouched.wat
@@ -27862,7 +27862,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -29378,7 +29378,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -29680,7 +29680,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -30091,7 +30091,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -33443,7 +33443,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -33968,7 +33968,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 0
   i32.shl
diff --git a/tests/compiler/std/map.optimized.wat b/tests/compiler/std/map.optimized.wat
index 69cf78fd01..7bf4b42b96 100644
--- a/tests/compiler/std/map.optimized.wat
+++ b/tests/compiler/std/map.optimized.wat
@@ -3144,7 +3144,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   local.tee $7
   i32.const 0
@@ -4175,7 +4175,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   local.tee $7
   i32.const 0
@@ -5306,7 +5306,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 1
   i32.shl
@@ -6341,7 +6341,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 1
   i32.shl
@@ -7941,7 +7941,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -9078,7 +9078,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
@@ -10104,7 +10104,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
@@ -11162,7 +11162,7 @@
   i32.const 8
   local.get $5
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -12268,7 +12268,7 @@
   i32.const 8
   local.get $5
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
@@ -12979,7 +12979,7 @@
   i32.const 8
   local.get $0
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
diff --git a/tests/compiler/std/map.untouched.wat b/tests/compiler/std/map.untouched.wat
index d16f134ca5..7e909ed4d4 100644
--- a/tests/compiler/std/map.untouched.wat
+++ b/tests/compiler/std/map.untouched.wat
@@ -17785,7 +17785,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 0
   i32.shl
@@ -17957,7 +17957,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -18654,7 +18654,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 0
   i32.shl
@@ -19258,7 +19258,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 1
   i32.shl
@@ -19862,7 +19862,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 1
   i32.shl
@@ -20630,7 +20630,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -21234,7 +21234,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
@@ -21838,7 +21838,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
@@ -22442,7 +22442,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -23046,7 +23046,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
diff --git a/tests/compiler/std/set.optimized.wat b/tests/compiler/std/set.optimized.wat
index d3ff7dda82..fdda9b61c5 100644
--- a/tests/compiler/std/set.optimized.wat
+++ b/tests/compiler/std/set.optimized.wat
@@ -2728,7 +2728,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   local.tee $7
   i32.const 0
@@ -3497,7 +3497,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   local.tee $7
   i32.const 0
@@ -4362,7 +4362,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 1
   i32.shl
@@ -5135,7 +5135,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 1
   i32.shl
@@ -5988,7 +5988,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -6758,7 +6758,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -7645,7 +7645,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
@@ -8418,7 +8418,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
@@ -9223,7 +9223,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -10076,7 +10076,7 @@
   i32.const 8
   local.get $4
   i32.const 8
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
diff --git a/tests/compiler/std/set.untouched.wat b/tests/compiler/std/set.untouched.wat
index aaa86a1c9e..3b37151db9 100644
--- a/tests/compiler/std/set.untouched.wat
+++ b/tests/compiler/std/set.untouched.wat
@@ -14298,7 +14298,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 0
   i32.shl
@@ -14526,7 +14526,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 0
   i32.shl
@@ -14754,7 +14754,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 1
   i32.shl
@@ -14982,7 +14982,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 1
   i32.shl
@@ -15210,7 +15210,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -15438,7 +15438,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -15666,7 +15666,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
@@ -15894,7 +15894,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl
@@ -16122,7 +16122,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 2
   i32.shl
@@ -16350,7 +16350,7 @@
   local.tee $3
   local.get $2
   local.get $3
-  i32.gt_s
+  i32.gt_u
   select
   i32.const 3
   i32.shl