diff --git a/.github/actions/basic-meson/action.yaml b/.github/actions/basic-meson/action.yaml
index 3449cd1cd..67519e99b 100644
--- a/.github/actions/basic-meson/action.yaml
+++ b/.github/actions/basic-meson/action.yaml
@@ -10,7 +10,7 @@ runs:
 
     - name: Setup
       run: |
-        $GITHUB_WORKSPACE/build/run-wrapper.sh meson $GITHUB_WORKSPACE/$BUILDDIR -Dstrict=true -Dprefix=$GITHUB_WORKSPACE/$INSTALLDIR -Dlibdir=$GITHUB_WORKSPACE/$INSTALLDIR/lib -Dsysconfdir=$GITHUB_WORKSPACE/$INSTALLDIR/etc -Dtrust_paths=$GITHUB_WORKSPACE/$INSTALLDIR/etc/pki/ca-trust-source:$GITHUB_WORKSPACE/$INSTALLDIR/share/pki/ca-trust-source -Dsystemd=disabled -Dbash_completion=disabled $MESON_BUILD_OPTS
+        $GITHUB_WORKSPACE/build/run-wrapper.sh meson setup $GITHUB_WORKSPACE/$BUILDDIR -Dstrict=true -Dprefix=$GITHUB_WORKSPACE/$INSTALLDIR -Dlibdir=$GITHUB_WORKSPACE/$INSTALLDIR/lib -Dsysconfdir=$GITHUB_WORKSPACE/$INSTALLDIR/etc -Dtrust_paths=$GITHUB_WORKSPACE/$INSTALLDIR/etc/pki/ca-trust-source:$GITHUB_WORKSPACE/$INSTALLDIR/share/pki/ca-trust-source -Dsystemd=disabled -Dbash_completion=disabled $MESON_BUILD_OPTS
       shell: bash
 
     - name: Build (scan-build)
diff --git a/build/cross_file_mingw64.txt b/build/cross_file_mingw64.txt
index 40c0b1ffb..109d3422b 100644
--- a/build/cross_file_mingw64.txt
+++ b/build/cross_file_mingw64.txt
@@ -4,7 +4,7 @@ cpu_family = 'x86_64'
 cpu = 'x86_64'
 endian = 'little'
 
-[properties]
+[built-in options]
 c_args = ['-fstack-protector']
 c_link_args = ['-fstack-protector']
 
diff --git a/common/test-hash.c b/common/test-hash.c
index a12d5a425..20d068410 100644
--- a/common/test-hash.c
+++ b/common/test-hash.c
@@ -50,12 +50,12 @@ test_murmur3 (void)
 
 	assert (sizeof (one) == P11_HASH_MURMUR3_LEN);
 
-	p11_hash_murmur3 ((unsigned char *)&one, "one", 3, NULL);
-	p11_hash_murmur3 ((unsigned char *)&two, "two", 3, NULL);
-	p11_hash_murmur3 ((unsigned char *)&four, "four", 4, NULL);
-	p11_hash_murmur3 ((unsigned char *)&seven, "seven", 5, NULL);
-	p11_hash_murmur3 ((unsigned char *)&eleven, "eleven", 6, NULL);
-	p11_hash_murmur3 ((unsigned char *)&split, "ele", 3, "ven", 3, NULL);
+	p11_hash_murmur3 ((unsigned char *)&one, "one", (size_t)3, NULL);
+	p11_hash_murmur3 ((unsigned char *)&two, "two", (size_t)3, NULL);
+	p11_hash_murmur3 ((unsigned char *)&four, "four", (size_t)4, NULL);
+	p11_hash_murmur3 ((unsigned char *)&seven, "seven", (size_t)5, NULL);
+	p11_hash_murmur3 ((unsigned char *)&eleven, "eleven", (size_t)6, NULL);
+	p11_hash_murmur3 ((unsigned char *)&split, "ele", (size_t)3, "ven", (size_t)3, NULL);
 
 	assert (one != two);
 	assert (one != four);