diff --git a/cryptoaead/crypto_aead_aes256gcm.go b/cryptoaead/crypto_aead_aes256gcm.go
index d08dfc7..c7b1ace 100644
--- a/cryptoaead/crypto_aead_aes256gcm.go
+++ b/cryptoaead/crypto_aead_aes256gcm.go
@@ -34,9 +34,11 @@ func CryptoAEADAES256GCMEncrypt(m []byte, ad []byte, nsec []byte, npub []byte, k
 	support.CheckSize(k, CryptoAEADAES256GCMKeyBytes(), "secret key")
 	support.CheckSize(npub, CryptoAEADAES256GCMNPubBytes(), "public nonce")
 	c := make([]byte, len(m)+CryptoAEADAES256GCMABytes())
+	cLen := len(c)
+	cLenLongLong := (C.ulonglong(cLen))
 	exit := int(C.crypto_aead_aes256gcm_encrypt(
 		(*C.uchar)(&c[0]),
-		(C.ulonglong)(len(c)),
+		&cLenLongLong,
 		(*C.uchar)(&m[0]),
 		(C.ulonglong)(len(m)),
 		(*C.uchar)(&ad[0]),
@@ -52,9 +54,12 @@ func CryptoAEADAES256GCMDecrypt(nsec []byte, c []byte, ad []byte, npub []byte, k
 	support.CheckSize(k, CryptoAEADAES256GCMKeyBytes(), "secret key")
 	support.CheckSize(npub, CryptoAEADAES256GCMNPubBytes(), "public nonce")
 	m := make([]byte, len(c)-CryptoAEADAES256GCMABytes())
+	mLen := len(m)
+	mLenLongLong := (C.ulonglong)(mLen)
+
 	exit := int(C.crypto_aead_aes256gcm_decrypt(
 		(*C.uchar)(&m[0]),
-		(C.ulonglong)(len(m)),
+		&mLenLongLong,
 		(*C.uchar)(&nsec[0]),
 		(*C.uchar)(&c[0]),
 		(C.ulonglong)(len(c)),
diff --git a/sodium/runtime.go b/sodium/runtime.go
index 2d0745f..d144df1 100644
--- a/sodium/runtime.go
+++ b/sodium/runtime.go
@@ -5,10 +5,6 @@ package sodium
 // #include <sodium.h>
 import "C"
 
-func RuntimeGetCpuFeatures() int {
-	return int(C.sodium_runtime_get_cpu_features())
-}
-
 func RuntimeHasNeon() bool {
 	return C.sodium_runtime_has_neon() != 0
 }