diff --git a/model/src/w3flx5md.F90 b/model/src/w3flx5md.F90
index 935c4a84f..daac6cf93 100644
--- a/model/src/w3flx5md.F90
+++ b/model/src/w3flx5md.F90
@@ -179,7 +179,7 @@ SUBROUTINE W3FLX5 ( ZWND, U10, U10D, TAUA, TAUADIR, RHOAIR, UST, USTD, Z0, CD )
 ! 2.  Computation ---------------------------------------------------- *
 !
 !
-      UST    = SQRT(TAUA/RHOAIR)
+      UST    = MAX ( 1E-4, SQRT(TAUA/RHOAIR) )
       UNZ    = MAX ( 0.01 , U10 )
       CD     = (UST/UNZ)**2
       USTD   = TAUADIR
diff --git a/model/src/w3ounfmetamd.F90 b/model/src/w3ounfmetamd.F90
index 4ad4fa887..d805c762d 100644
--- a/model/src/w3ounfmetamd.F90
+++ b/model/src/w3ounfmetamd.F90
@@ -954,9 +954,9 @@ SUBROUTINE READ_META_PAIRS(NDMI, META, ILINE)
 !
 !/ ------------------------------------------------------------------- /
       IMPLICIT NONE
-      INTEGER, INTENT(IN)               :: NDMI
-      TYPE(META_T), INTENT(IN), POINTER :: META
-      INTEGER, INTENT(INOUT)            :: ILINE
+      INTEGER, INTENT(IN)                  :: NDMI
+      TYPE(META_T), INTENT(INOUT), POINTER :: META
+      INTEGER, INTENT(INOUT)               :: ILINE
 !/ ------------------------------------------------------------------- /
 !/ Local parameters
 !
diff --git a/model/src/w3srcemd.F90 b/model/src/w3srcemd.F90
index 6ebac677b..c62b47eeb 100644
--- a/model/src/w3srcemd.F90
+++ b/model/src/w3srcemd.F90
@@ -51,11 +51,11 @@ MODULE W3SRCEMD
 !/ ------------------------------------------------------------------- /
       SUBROUTINE W3SRCE ( srce_call, IT, JSEA, IX, IY, IMOD,          &
                           SPECOLD, SPEC, VSIO, VDIO, SHAVEIO,         &
-                          ALPHA, WN1, CG1,                            &
-                          D_INP, U10ABS, U10DIR, AS, USTAR, USTDIR,   &
+                          ALPHA, WN1, CG1, D_INP, U10ABS, U10DIR,     &
 #ifdef W3_FLX5
                           TAUA, TAUADIR,                              &
 #endif
+                          AS, USTAR, USTDIR,                          &
                           CX, CY,  ICE, ICEH, ICEF, ICEDMAX,          &
                           REFLEC, REFLED, DELX, DELY, DELA, TRNX,     &
                           TRNY, BERG, FPI, DTDYN, FCUT, DTG, TAUWX,   &