diff --git a/model/src/w3initmd.F90 b/model/src/w3initmd.F90
index 69d1c256dd..0618859035 100644
--- a/model/src/w3initmd.F90
+++ b/model/src/w3initmd.F90
@@ -969,9 +969,9 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
       if (runtype == 'continue' )then
         call set_user_timestring(time,user_timestring)
         if (restart_from_binary) then
-          fname = trim(FNMRST)//trim(user_restfname)//trim(user_timestring)
+          fname = trim(user_restfname)//trim(user_timestring)
         else
-          fname = trim(FNMRST)//trim(user_restfname)//trim(user_timestring)//'.nc'
+          fname = trim(user_restfname)//trim(user_timestring)//'.nc'
         endif
         inquire(file=trim(fname), exist=exists)
         if (exists) then
@@ -986,7 +986,7 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
       else
         if (restart_from_binary) then
           call set_user_timestring(time,user_timestring)
-          fname = trim(FNMRST)//trim(user_restfname)//trim(user_timestring)
+          fname = trim(user_restfname)//trim(user_timestring)
           inquire(file=trim(fname), exist=exists)
           if (exists) then
             call w3iors('READ', nds(6), sig(nk), imod, filename=trim(fname))
diff --git a/model/src/w3iogomd.F90 b/model/src/w3iogomd.F90
index 308e5a5673..fa1f17617f 100644
--- a/model/src/w3iogomd.F90
+++ b/model/src/w3iogomd.F90
@@ -2781,7 +2781,7 @@ SUBROUTINE W3IOGO ( INXOUT, NDSOG, IOTST, IMOD &
       J      = LEN_TRIM(FNMPRE_LOCAL)
       !
       ! Create TIMETAG for file name using YYYYMMDD.HHMMS prefix
-      WRITE(TIMETAG,"(i8.8,'.'i6.6)")TIME(1),TIME(2)
+      WRITE(TIMETAG, '(i8.8, ".", i6.6)') TIME(1), TIME(2)
 #ifdef W3_T
       WRITE (NDST,9001) FNMPRE_LOCAL(:J)//TIMETAG//'.out_grd.'//FILEXT(:I)
 #endif
diff --git a/model/src/w3iopomd.F90 b/model/src/w3iopomd.F90
index 896c8f8e18..ac48f911fc 100644
--- a/model/src/w3iopomd.F90
+++ b/model/src/w3iopomd.F90
@@ -607,16 +607,16 @@ SUBROUTINE W3IOPP ( NPT, XPT, YPT, PNAMES, IMOD, MPI_COMM_IOPP )
       ! Broadcast weight info to all MPI tasks:
 
       !First broadcast NOPTS, used in the next calls:
-      CALL MPI_BCAST(NOPTS,1,MPI_INTEGER,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
+      CALL MPI_BCAST(NOPTS,1,MPI_INTEGER,0,MPI_COMM_IOPP,IERR_MPI)
       CALL MPI_Barrier(MPI_COMM_IOPP,IERR_MPI)
 
-      CALL MPI_BCAST(PTLOC,2*NPT,MPI_REAL,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
-      CALL MPI_BCAST(PTIFAC,4*NPT,MPI_REAL,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
-      CALL MPI_BCAST(IPTINT(:,:,1:NOPTS),2*4*NOPTS,MPI_INTEGER,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
+      CALL MPI_BCAST(PTLOC,2*NPT,MPI_REAL,0,MPI_COMM_IOPP,IERR_MPI)
+      CALL MPI_BCAST(PTIFAC,4*NPT,MPI_REAL,0,MPI_COMM_IOPP,IERR_MPI)
+      CALL MPI_BCAST(IPTINT(:,:,1:NOPTS),2*4*NOPTS,MPI_INTEGER,0,MPI_COMM_IOPP,IERR_MPI)
 
       !Send point names individually
       DO IPT=1, NOPTS
-        CALL MPI_BCAST(PTNME(IPT),40,MPI_CHARACTER,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
+        CALL MPI_BCAST(PTNME(IPT),40,MPI_CHARACTER,0,MPI_COMM_IOPP,IERR_MPI)
       ENDDO
 
       CALL MPI_Barrier(MPI_COMM_IOPP,IERR_MPI)
@@ -2013,7 +2013,7 @@ SUBROUTINE W3IOPON ( INXOUT, NDSOP, IOTST, IMOD, TOUT )
 
     IF ( OFILES(2) .EQ. 1 ) THEN
       ! Create TIMETAG for file name using YYYYMMDD.HHMMS prefix
-      WRITE(TIMETAG,"(i8.8,'.'i6.6)")TIME(1),TIME(2)
+      WRITE(TIMETAG, '(i8.8, ".", i6.6)') TIME(1), TIME(2) 
       filename = FNMPRE_LOCAL(:LEN_TRIM(FNMPRE_LOCAL))//TIMETAG//'.out_pnt.'//FILEXT(:LEN_TRIM(FILEXT))//'.nc'
       FNAME = TIMETAG//'.out_pnt.'//FILEXT(:LEN_TRIM(FILEXT))
     ELSE
@@ -2401,7 +2401,7 @@ SUBROUTINE W3IOPO ( INXOUT, NDSOP, IOTST, IMOD &
       J      = LEN_TRIM(FNMPRE_LOCAL)
 
       ! Create TIMETAG for file name using YYYYMMDD.HHMMS prefix
-      WRITE(TIMETAG,"(i8.8,'.'i6.6)")TIME(1),TIME(2)
+      WRITE(TIMETAG, '(i8.8, ".", i6.6)') TIME(1), TIME(2)
       !
 #ifdef W3_T
       WRITE (NDST,9001) FNMPRE_LOCAL(:J)//TIMETAG//'.out_pnt.'// &
diff --git a/model/src/w3iorsmd.F90 b/model/src/w3iorsmd.F90
index 1e60888b80..03fb8dfe44 100644
--- a/model/src/w3iorsmd.F90
+++ b/model/src/w3iorsmd.F90
@@ -483,7 +483,7 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT , filename)
       ITMP=0
       IF ( PRESENT(FLRSTRT) ) THEN
         IF (FLRSTRT) THEN
-          WRITE(TIMETAG,"(i8.8,'.'i6.6)")TIME(1),TIME(2)
+          WRITE(TIMETAG, '(i8.8, ".", i6.6)') TIME(1), TIME(2)
           FNAME=TIMETAG//'.restart.'//FILEXT(:I)
           ITMP=1
         END IF