diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d3062f67dd..cbc9e2f6e3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,8 +113,8 @@ target_link_libraries(elementssimplicity
     core_interface
 )
 
-# macOS Apple Clang is stricter than Linux GCC on this vendored code
-if(APPLE)
+# Clang is stricter than Linux GCC on this vendored code
+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
   target_compile_options(elementssimplicity PRIVATE
     -Wno-error=conditional-uninitialized
     -Wno-error=implicit-fallthrough
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index 370a839700..0f9af8828c 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -986,8 +986,10 @@ def calc_witness_hash(self):
     def is_valid(self):
         self.calc_sha256()
         for tout in self.vout:
-            if tout.nValue < 0 or tout.nValue > 21000000 * COIN:
-                return False
+            if tout.nValue.vchCommitment[0] == 1:  # explicit amount
+                amount = tout.nValue.getAmount()
+                if amount < 0 or amount > 21000000 * COIN:
+                    return False
         return True
 
     # Calculate the transaction weight using witness and non-witness