diff --git a/components/mroipac/correlation/src/cchz_wave.cpp b/components/mroipac/correlation/src/cchz_wave.cpp
index e710f1d..e672cb6 100644
--- a/components/mroipac/correlation/src/cchz_wave.cpp
+++ b/components/mroipac/correlation/src/cchz_wave.cpp
@@ -168,7 +168,8 @@ int cchz_wave(int flag, DataAccessor* intAcc, DataAccessor* ampAcc, DataAccessor
 
                 cmp[i][j] = conj(dt1) * dt2;
        
-                i1[i][j] = abs(dt1) + 1i * abs(dt2);
+//                i1[i][j] = std::abs(dt1) + 1i * std::abs(dt2);
+                i1[i][j] = std::complex<float>(std::abs(dt1), std::abs(dt2));
             }
         }
     }
@@ -190,7 +191,7 @@ int cchz_wave(int flag, DataAccessor* intAcc, DataAccessor* ampAcc, DataAccessor
                 dt2 = i1[bx-1][j];
 
                 cmp[bx-1][j] = conj(dt1) * dt2;
-                i1[bx-1][j] = abs(dt1) + 1i * abs(dt2);
+                i1[bx-1][j] = std::complex<float>(std::abs(dt1), std::abs(dt2));
             } 
         }
 
diff --git a/contrib/demUtils/correct_geoid_i2_srtm/src/correct_geoid_i2_srtm.f b/contrib/demUtils/correct_geoid_i2_srtm/src/correct_geoid_i2_srtm.f
index 08bf8c1..b92ea42 100644
--- a/contrib/demUtils/correct_geoid_i2_srtm/src/correct_geoid_i2_srtm.f
+++ b/contrib/demUtils/correct_geoid_i2_srtm/src/correct_geoid_i2_srtm.f
@@ -529,13 +529,13 @@ c     PARAMETERS:
 c     INPUT VARIABLES:
 
       integer nmax
-      real*8 p(MAXSIZ)
-      real*8 hc(MAXSIZ)
-      real*8 hs(MAXSIZ)
-      real*8 cc(MAXSIZ)
-      real*8 cs(MAXSIZ)
-      real*8 sinml(MAXSIZ)
-      real*8 cosml(MAXSIZ)
+      real*8 p(*)
+      real*8 hc(*)
+      real*8 hs(*)
+      real*8 cc(*)
+      real*8 cs(*)
+      real*8 sinml(*)
+      real*8 cosml(*)
       real*8 re
       real*8 ang
       real*8 haco