diff --git a/sorc/ncep_post.fd/CALMCVG.f b/sorc/ncep_post.fd/CALMCVG.f
index b354052d6..d2ec706e3 100644
--- a/sorc/ncep_post.fd/CALMCVG.f
+++ b/sorc/ncep_post.fd/CALMCVG.f
@@ -81,6 +81,10 @@ SUBROUTINE CALMCVG(Q1D,U1D,V1D,QCNVG)
 !     
 !     INITIALIZE MOISTURE CONVERGENCE ARRAY.  LOAD TEMPORARY WIND ARRAYS.
 !     
+       CALL EXCH(Q1D)
+       CALL EXCH(U1D)
+       CALL EXCH(V1D)
+
 !$omp  parallel do private(i,j)
       DO J=JSTA_2L,JEND_2U
 !        DO I=1,IM
@@ -96,10 +100,6 @@ SUBROUTINE CALMCVG(Q1D,U1D,V1D,QCNVG)
           IF (VWND(I,J) == SPVAL) VWND(I,J) = D00
         ENDDO
       ENDDO
-      
-      CALL EXCH(Q1D)
-      CALL EXCH(VWND)
-      CALL EXCH(UWND)
 !
       IF(gridtype == 'A')THEN
 !$omp  parallel do private(i,j,qudx,qvdy,r2dx,r2dy)
diff --git a/sorc/ncep_post.fd/CALUPDHEL.f b/sorc/ncep_post.fd/CALUPDHEL.f
index 65bf0fa50..ff9704506 100644
--- a/sorc/ncep_post.fd/CALUPDHEL.f
+++ b/sorc/ncep_post.fd/CALUPDHEL.f
@@ -103,6 +103,8 @@ SUBROUTINE CALUPDHEL(UPDHEL)
       DO J=JSTA_M,JEND_M
         DO I=ISTA_M,IEND_M
 
+          IF (HTSFC(I,J) < spval) THEN
+
           R2DX   = 1./(2.*DX(I,J))
           R2DY   = 1./(2.*DY(I,J))
 
@@ -135,6 +137,11 @@ SUBROUTINE CALUPDHEL(UPDHEL)
 
             ENDIF
           ENDDO l_loop
+
+          ELSE
+            UPDHEL(I,J) = spval
+          ENDIF
+
         ENDDO
       ENDDO