diff --git a/src/augmatch.c b/src/augmatch.c
index 67c9d2a6c..ba142c0cf 100644
--- a/src/augmatch.c
+++ b/src/augmatch.c
@@ -302,7 +302,7 @@ static char *guess_lens_name(const char *file) {
 
 int main(int argc, char **argv) {
     int opt;
-    cleanup(aug_closep) struct augeas *aug;
+    cleanup(aug_closep) struct augeas *aug = NULL;
     cleanup(freep) char *loadpath = NULL;
     size_t loadpath_len = 0;
     cleanup(freep) char *root = NULL;
diff --git a/src/lens.c b/src/lens.c
index 69ee9230e..4b70dfb4a 100644
--- a/src/lens.c
+++ b/src/lens.c
@@ -975,8 +975,10 @@ void free_lens(struct lens *lens) {
         return;
     ensure(lens->ref == 0, lens->info);
 
+#if ENABLE_DEBUG
     if (debugging("lenses"))
         dump_lens_tree(lens);
+#endif
     switch (lens->tag) {
     case L_DEL:
         unref(lens->regexp, regexp);