diff --git a/tests/test_addfield.F90 b/tests/test_addfield.F90
index 643475b6..31e6dd4e 100644
--- a/tests/test_addfield.F90
+++ b/tests/test_addfield.F90
@@ -163,8 +163,8 @@ program test_addfield
   if (ierr .ne. 0) stop 1
   cgrib = s3grib
   
-  print *, 'Spherical Harmonic Complex Packing where J, K, and M  & 
-      pentagonal resolution parameters = 0, error=9'
+  print *, 'Spherical Harmonic Complex Packing where J, K, and M',  & 
+       ' pentagonal resolution parameters = 0, error=9'
   idrstmplen = 10
   idrsnum = 51
   call addfield(cgrib, lcgrib, ipdsnum, ipdstmpl, ipdstmplen, &
diff --git a/utils/copygb2.F90 b/utils/copygb2.F90
index c9c66531..b4320f9b 100644
--- a/utils/copygb2.F90
+++ b/utils/copygb2.F90
@@ -595,10 +595,11 @@ SUBROUTINE CPGB(LG1,LX1,LGB,LXB,LGM,LXM,LG2, &
     INTEGER KGDTI(200)
     INTEGER IPOPT(20)
     INTEGER IDS(255),IBS(255),NBS(255)
-    INTEGER JPDS(200),JGDS(200),JENS(5)
+    !INTEGER JPDS(200)
+    INTEGER JGDS(200),JENS(5)
     INTEGER KPDSB(200),KGDSB(200),KENSB(5)
-    INTEGER KPDSM(200),KGDSM(200),KENSM(5)
-    CHARACTER*80 CIN
+    !INTEGER KPDSM(200),KGDSM(200),KENSM(5)
+    !CHARACTER*80 CIN
     LOGICAL UNPACK
     TYPE( GRIBFIELD ) :: GFLD1,GFLDM
 
@@ -834,10 +835,12 @@ SUBROUTINE CPGB1(LG1,LX1,M1, &
     INTEGER,TARGET :: KGDTI(200)
     INTEGER IPOPT(20)
     INTEGER IDS(255),IBS(255),NBS(255)
-    INTEGER JPDS(200),JGDS(200),JENS(5)
-    INTEGER KPDS1(200),KGDS1(200),KENS1(5)
+    !INTEGER JPDS(200)
+    INTEGER JGDS(200),JENS(5)
+    !INTEGER KPDS1(200),KGDS1(200)
+    !INTEGER KENS1(5)
     INTEGER KPDSB(200),KGDSB(200),KENSB(5)
-    INTEGER KPDSM(200),KGDSM(200),KENSM(5)
+    !INTEGER KPDSM(200),KGDSM(200),KENSM(5)
     INTEGER,POINTER :: TMPPTR(:)
     LOGICAL*1 LR(MF)
     LOGICAL*1,POINTER :: L1I(:),LBI(:)