diff --git a/scripts/test/shared.py b/scripts/test/shared.py
index 909b20c4b71..d593aa45b5a 100644
--- a/scripts/test/shared.py
+++ b/scripts/test/shared.py
@@ -399,16 +399,13 @@ def get_tests(test_dir, extensions=[], recursive=False):
 # delete the old file, make sure you rename the corresponding .wast.log file in
 # expected-output/ if any.
 SPEC_TESTS_TO_SKIP = [
-    # Malformed module accepted
+    # Requires us to write our own floating point parser
     'const.wast',
-    'address.wast',
 
     # Unlinkable module accepted
     'linking.wast',
 
     # Invalid module accepted
-    'func.wast',
-    'type.wast',
     'unreached-invalid.wast',
 
     # Test invalid
diff --git a/src/support/string.cpp b/src/support/string.cpp
index 01fe4e522f6..7dc9ba89c55 100644
--- a/src/support/string.cpp
+++ b/src/support/string.cpp
@@ -318,6 +318,9 @@ std::ostream& writeWTF16CodePoint(std::ostream& os, uint32_t u) {
   return os;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+
 bool convertWTF8ToWTF16(std::ostream& os, std::string_view str) {
   bool valid = true;
   bool lastWasLeadingSurrogate = false;
@@ -343,6 +346,8 @@ bool convertWTF8ToWTF16(std::ostream& os, std::string_view str) {
   return valid;
 }
 
+#pragma GCC diagnostic pop
+
 bool convertWTF16ToWTF8(std::ostream& os, std::string_view str) {
   return doConvertWTF16ToWTF8(os, str, true);
 }
diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
index f8bd08e1dec..13993c82518 100644
--- a/src/wasm/wasm-validator.cpp
+++ b/src/wasm/wasm-validator.cpp
@@ -526,6 +526,7 @@ struct FunctionValidator : public WalkerPass<PostWalker<FunctionValidator>> {
     return info.shouldBeSubType(left, right, curr, text, getFunction());
   }
 
+  void validateOffset(Address offset, Memory* mem, Expression* curr);
   void validateAlignment(
     size_t align, Type type, Index bytes, bool isAtomic, Expression* curr);
   void validateMemBytes(uint8_t bytes, Type type, Expression* curr);
@@ -1046,6 +1047,7 @@ void FunctionValidator::visitLoad(Load* curr) {
                  "SIMD operations require SIMD [--enable-simd]");
   }
   validateMemBytes(curr->bytes, curr->type, curr);
+  validateOffset(curr->offset, memory, curr);
   validateAlignment(curr->align, curr->type, curr->bytes, curr->isAtomic, curr);
   shouldBeEqualOrFirstIsUnreachable(
     curr->ptr->type,
@@ -1077,6 +1079,7 @@ void FunctionValidator::visitStore(Store* curr) {
                  "SIMD operations require SIMD [--enable-simd]");
   }
   validateMemBytes(curr->bytes, curr->valueType, curr);
+  validateOffset(curr->offset, memory, curr);
   validateAlignment(
     curr->align, curr->valueType, curr->bytes, curr->isAtomic, curr);
   shouldBeEqualOrFirstIsUnreachable(
@@ -1370,6 +1373,7 @@ void FunctionValidator::visitSIMDLoad(SIMDLoad* curr) {
       break;
   }
   Index bytes = curr->getMemBytes();
+  validateOffset(curr->offset, memory, curr);
   validateAlignment(curr->align, memAlignType, bytes, /*isAtomic=*/false, curr);
 }
 
@@ -1423,6 +1427,7 @@ void FunctionValidator::visitSIMDLoadStoreLane(SIMDLoadStoreLane* curr) {
       WASM_UNREACHABLE("Unexpected SIMDLoadStoreLane op");
   }
   Index bytes = curr->getMemBytes();
+  validateOffset(curr->offset, memory, curr);
   validateAlignment(curr->align, memAlignType, bytes, /*isAtomic=*/false, curr);
   shouldBeTrue(curr->index < lanes, curr, "invalid lane index");
 }
@@ -3457,6 +3462,14 @@ void FunctionValidator::visitFunction(Function* curr) {
   }
 }
 
+void FunctionValidator::validateOffset(Address offset,
+                                       Memory* mem,
+                                       Expression* curr) {
+  shouldBeTrue(mem->is64() || offset <= std::numeric_limits<uint32_t>::max(),
+               curr,
+               "offset must be u32");
+}
+
 void FunctionValidator::validateAlignment(
   size_t align, Type type, Index bytes, bool isAtomic, Expression* curr) {
   if (isAtomic) {
diff --git a/test/spec/address.wast b/test/spec/address.wast
index e071cca5038..212b7a85aa6 100644
--- a/test/spec/address.wast
+++ b/test/spec/address.wast
@@ -203,7 +203,7 @@
 (assert_trap (invoke "16s_bad" (i32.const 1)) "out of bounds memory access")
 (assert_trap (invoke "32_bad" (i32.const 1)) "out of bounds memory access")
 
-(assert_malformed
+(assert_invalid
   (module quote
     "(memory 1)"
     "(func (drop (i32.load offset=4294967296 (i32.const 0))))"
diff --git a/test/spec/func.wast b/test/spec/func.wast
index a6b05f53c09..af685fb9d10 100644
--- a/test/spec/func.wast
+++ b/test/spec/func.wast
@@ -489,19 +489,6 @@
 
 ;; Invalid typing of result
 
-(assert_invalid
-  (module (func $type-multiple-result (result i32 i32) (unreachable)))
-  "invalid result arity"
-)
-(assert_invalid
-  (module
-    (type (func (result i32 i32)))
-    (func $type-multiple-result (type 0) (unreachable))
-  )
-  "invalid result arity"
-)
-
-
 (assert_invalid
   (module (func $type-empty-i32 (result i32)))
   "type mismatch"
diff --git a/test/spec/type.wast b/test/spec/type.wast
index 5ceeeb26977..b94063e6a04 100644
--- a/test/spec/type.wast
+++ b/test/spec/type.wast
@@ -11,33 +11,33 @@
   (type (func (param $x i32) (result i32)))
 
   (type (func (param f32 f64)))
-  ;; (type (func (result i64 f32)))
-  ;; (type (func (param i32 i64) (result f32 f64)))
+  (type (func (result i64 f32)))
+  (type (func (param i32 i64) (result f32 f64)))
 
   (type (func (param f32) (param f64)))
   (type (func (param $x f32) (param f64)))
   (type (func (param f32) (param $y f64)))
   (type (func (param $x f32) (param $y f64)))
-  ;; (type (func (result i64) (result f32)))
-  ;; (type (func (param i32) (param i64) (result f32) (result f64)))
-  ;; (type (func (param $x i32) (param $y i64) (result f32) (result f64)))
+  (type (func (result i64) (result f32)))
+  (type (func (param i32) (param i64) (result f32) (result f64)))
+  (type (func (param $x i32) (param $y i64) (result f32) (result f64)))
 
   (type (func (param f32 f64) (param $x i32) (param f64 i32 i32)))
-  ;; (type (func (result i64 i64 f32) (result f32 i32)))
-  ;; (type
-  ;;   (func (param i32 i32) (param i64 i32) (result f32 f64) (result f64 i32))
-  ;; )
+  (type (func (result i64 i64 f32) (result f32 i32)))
+  (type
+    (func (param i32 i32) (param i64 i32) (result f32 f64) (result f64 i32))
+  )
 
   (type (func (param) (param $x f32) (param) (param) (param f64 i32) (param)))
-  ;; (type
-  ;;   (func (result) (result) (result i64 i64) (result) (result f32) (result))
-  ;; )
-  ;; (type
-  ;;   (func
-  ;;     (param i32 i32) (param i64 i32) (param) (param $x i32) (param)
-  ;;     (result) (result f32 f64) (result f64 i32) (result)
-  ;;   )
-  ;; )
+  (type
+    (func (result) (result) (result i64 i64) (result) (result f32) (result))
+  )
+  (type
+    (func
+      (param i32 i32) (param i64 i32) (param) (param $x i32) (param)
+      (result) (result f32 f64) (result f64 i32) (result)
+    )
+  )
 )
 
 (assert_malformed
@@ -48,12 +48,3 @@
   (module quote "(type (func (result $x i32)))")
   "unexpected token"
 )
-
-(assert_invalid
-  (module (type (func (result i32 i32))))
-  "invalid result arity"
-)
-(assert_invalid
-  (module (type (func (result i32) (result i32))))
-  "invalid result arity"
-)