diff --git a/Makefile.am b/Makefile.am
index 099dd1e..59ec189 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ else
 @CODE_COVERAGE_RULES@
 endif
 
-COMMON_CFLAGS = $(CRYPTO_CFLAGS)
+COMMON_CFLAGS = -Werror -Wall $(CRYPTO_CFLAGS)
 COMMON_LDFLAGS =
 if WITH_ASAN
 COMMON_CFLAGS += -O1 -g -fsanitize=address -fno-omit-frame-pointer
diff --git a/src/tpm2-provider-cipher.c b/src/tpm2-provider-cipher.c
index 84db9bf..8dfeee1 100644
--- a/src/tpm2-provider-cipher.c
+++ b/src/tpm2-provider-cipher.c
@@ -58,7 +58,7 @@ tpm2_cipher_all_newctx(void *provctx,
 }
 
 #define IMPLEMENT_CIPHER_NEWCTX(alg,kbits,amode,blkbits) \
-    static OSSL_FUNC_cipher_newctx_fn tpm2_cipher_##alg##kbits##lcmode##_newctx; \
+    static OSSL_FUNC_cipher_newctx_fn tpm2_cipher_##alg##kbits##amode##_newctx; \
     static void * \
     tpm2_cipher_##alg##kbits##amode##_newctx(void *provctx) \
     { \
diff --git a/test/ec_genpkey_store_load.c b/test/ec_genpkey_store_load.c
index 3e5ca58..db5cd47 100644
--- a/test/ec_genpkey_store_load.c
+++ b/test/ec_genpkey_store_load.c
@@ -96,7 +96,7 @@ int sign_message(EVP_PKEY *pkey)
 
 int load_and_sign(const char *filename, const char *password)
 {
-    OSSL_STORE_CTX *ctx;
+    OSSL_STORE_CTX *ctx = NULL;
     UI_METHOD *ui_method = NULL;
     int ret = 1;