diff --git a/src/cdf_write.c b/src/cdf_write.c
index 0fcb3aef917189b75da0132d1249df128106610c..5a74b1767c80cf80e4a25e65df96ca8f09ce3a31 100644
--- a/src/cdf_write.c
+++ b/src/cdf_write.c
@@ -476,7 +476,7 @@ void cdfDefineCoordinates(const stream_t *streamptr, int ncvarid, int nczvarID,
         }
     }
 
-  size_t len = strlen(coordinates);
+  const size_t len = strlen(coordinates);
   if ( len ) cdf_put_att_text(fileID, ncvarid, "coordinates", len, coordinates);
 }
 
diff --git a/src/stream_cdf_o.c b/src/stream_cdf_o.c
index 1e2316ff931dae8ddae237e270190219f57593b1..328601299048731daa3ee7ac9977d556d35d96eb 100644
--- a/src/stream_cdf_o.c
+++ b/src/stream_cdf_o.c
@@ -799,9 +799,9 @@ void cdfDefCurvilinear(stream_t *streamptr, int gridID, int gridindex)
 {
   ncgrid_t *ncgrid = streamptr->ncgrid;
 
-  size_t dimlen = gridInqSize(gridID);
-  size_t xdimlen = gridInqXsize(gridID);
-  size_t ydimlen = gridInqYsize(gridID);
+  const size_t dimlen = gridInqSize(gridID);
+  const size_t xdimlen = gridInqXsize(gridID);
+  const size_t ydimlen = gridInqYsize(gridID);
 
   int xdimID = CDI_UNDEFID, ydimID = CDI_UNDEFID;
   int ncxvarid = CDI_UNDEFID, ncyvarid = CDI_UNDEFID, ncavarid = CDI_UNDEFID;
@@ -812,10 +812,10 @@ void cdfDefCurvilinear(stream_t *streamptr, int gridID, int gridindex)
         = cdfSearchIDBySize(ofs, (size_t)gridindex, ncgrid, CDF_DIMID_X,
                             GRID_CURVILINEAR, (int)dimlen,
                             gridInqType, gridInqSize);
-      size_t index = search.foundIdx;
+      const size_t index = search.foundIdx;
       if ( index != SIZE_MAX )
         {
-          int gridID0 = ncgrid[index].gridID;
+          const int gridID0 = ncgrid[index].gridID;
           if (    IS_EQUAL(gridInqXval(gridID0, 0), gridInqXval(gridID, 0))
                && IS_EQUAL(gridInqXval(gridID0, dimlen-1),
                            gridInqXval(gridID, dimlen-1))
@@ -864,7 +864,7 @@ void cdfDefUnstructured(stream_t *streamptr, int gridID, int gridindex)
 {
   ncgrid_t *ncgrid = streamptr->ncgrid;
 
-  size_t dimlen = gridInqSize(gridID);
+  const size_t dimlen = gridInqSize(gridID);
 
   int dimID = CDI_UNDEFID;
   int ncxvarid = CDI_UNDEFID, ncyvarid = CDI_UNDEFID, ncavarid = CDI_UNDEFID;
@@ -875,10 +875,10 @@ void cdfDefUnstructured(stream_t *streamptr, int gridID, int gridindex)
         = cdfSearchIDBySize(ofs, (size_t)gridindex, ncgrid, CDF_DIMID_X,
                             GRID_UNSTRUCTURED, (int)dimlen,
                             gridInqType, gridInqSize);
-      size_t index = search.foundIdx;
+      const size_t index = search.foundIdx;
       if ( index != SIZE_MAX )
         {
-          int gridID0 = ncgrid[index].gridID;
+          const int gridID0 = ncgrid[index].gridID;
           if ( gridInqNvertex(gridID0) == gridInqNvertex(gridID) &&
                IS_EQUAL(gridInqXval(gridID0, 0), gridInqXval(gridID, 0)) &&
                IS_EQUAL(gridInqXval(gridID0, dimlen-1),
@@ -1933,7 +1933,7 @@ void cdfDefGrid(stream_t *streamptr, int gridID, int gridindex)
   else if ( gridtype == GRID_GAUSSIAN_REDUCED )
     {
       cdfDefRgrid(streamptr, gridID, gridindex);
-      //if ( gridInqYsize(gridID) ) cdfDefYaxis(streamptr, gridID, gridindex, 1);
+      // if ( gridInqYsize(gridID) ) cdfDefYaxis(streamptr, gridID, gridindex, 1);
     }
   else if ( gridtype == GRID_SPECTRAL )
     {