diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index 88ca91240f4d..e95b568d0b08 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -180,8 +180,8 @@ def test_osr_xml_2():
     got = srs.ExportToXML()
 
     # Strip the gml:id tags
-    got = re.sub(r' gml:id="[^"]*"', "", got, 0)
-    expected = re.sub(r' gml:id="[^"]*"', "", expected, 0)
+    got = re.sub(r' gml:id="[^"]*"', "", got)
+    expected = re.sub(r' gml:id="[^"]*"', "", expected)
 
     assert got == expected
 
diff --git a/gcore/gdaldataset.cpp b/gcore/gdaldataset.cpp
index ca17538cead6..a6bf53191298 100644
--- a/gcore/gdaldataset.cpp
+++ b/gcore/gdaldataset.cpp
@@ -2160,6 +2160,7 @@ CPLErr GDALDataset::BuildOverviews(const char *pszResampling, int nOverviews,
                      "panOverviewList[%d] = %d is invalid. It must be a "
                      "positive value",
                      i, panOverviewList[i]);
+            CPLFree(panAllBandList);
             return CE_Failure;
         }
     }