3 files changed, 15 insertions, 4 deletions
diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp
index d5bcfa84..575eae39 100644
--- a/src/iso19111/coordinateoperation.cpp
+++ b/src/iso19111/coordinateoperation.cpp
@@ -552,7 +552,9 @@ struct CoordinateOperation::Private {
 
 // ---------------------------------------------------------------------------
 
-GridDescription::GridDescription() = default;
+GridDescription::GridDescription()
+    : shortName{}, fullName{}, packageName{}, url{}, directDownload(false),
+      openLicense(false), available(false) {}
 
 GridDescription::~GridDescription() = default;
 
@@ -10802,7 +10804,7 @@ struct MyPROJStringExportableHorizVerticalHorizPROJBased final
 
 MyPROJStringExportableHorizVerticalHorizPROJBased::
     ~MyPROJStringExportableHorizVerticalHorizPROJBased() = default;
-}
+} // namespace operation
 NS_PROJ_END
 
 #if 0
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index b00a2c1a..3530f5d8 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -1359,6 +1359,15 @@ const DatabaseContextNNPtr &AuthorityFactory::databaseContext() const {
 
 // ---------------------------------------------------------------------------
 
+//! @cond Doxygen_Suppress
+AuthorityFactory::CRSInfo::CRSInfo()
+    : authName{}, code{}, name{}, type{ObjectType::CRS}, deprecated{},
+      bbox_valid{}, west_lon_degree{}, south_lat_degree{}, east_lon_degree{},
+      north_lat_degree{}, areaName{}, projectionMethodName{} {}
+//! @endcond
+
+// ---------------------------------------------------------------------------
+
 /** \brief Returns an arbitrary object from a code.
  *
  * The returned object will typically be an instance of Datum,
diff --git a/src/transformations/molodensky.cpp b/src/transformations/molodensky.cpp
index 373b1095..289c321e 100644
--- a/src/transformations/molodensky.cpp
+++ b/src/transformations/molodensky.cpp
@@ -140,7 +140,7 @@ static PJ_LPZ calc_standard_params(PJ_LPZ lpz, PJ *P) {
 
     /* ellipsoid radii of curvature */
     double rho = RM(a, P->es, lpz.phi);
-    double nu  = RN(a, P->e2s, lpz.phi);
+    double nu  = RN(a, P->es, lpz.phi);
 
     /* delta phi */
     dphi  = (-dx*sphi*clam) - (dy*sphi*slam) + (dz*cphi)
@@ -193,7 +193,7 @@ static PJ_LPZ calc_abridged_params(PJ_LPZ lpz, PJ *P) {
 
     /* delta lambda */
     dlam = -dx*slam + dy*clam;
-    const double dlam_denom = RN(P->a, P->e2s, lpz.phi)*cphi;
+    const double dlam_denom = RN(P->a, P->es, lpz.phi)*cphi;
     if( dlam_denom == 0.0 ) {
         lpz.lam = HUGE_VAL;
         return lpz;