diff --git a/scripts/genf90.pl b/scripts/genf90.pl
index ec7d0dba28b..6dba47d7687 100755
--- a/scripts/genf90.pl
+++ b/scripts/genf90.pl
@@ -9,8 +9,8 @@
 # to generate F90 code for all of the desired specific types.
 #
 # Keywords are delimited by curly brackets: {}
-# 
-# {TYPE} and {DIMS} are used to generate the specific subroutine names from the 
+#
+# {TYPE} and {DIMS} are used to generate the specific subroutine names from the
 #            generic template
 # {TYPE} : Variable type name; implemented types are character, 4 or 8 byte real,
 #          and 4 or 8 byte integer.
@@ -20,7 +20,7 @@
 #                if {TYPE}=double then {VTYPE} is "real(r8)"
 # {ITYPE}, {ITYPENAME} : Used to generate CPP statements for the specific type.
 # {MPITYPE} : Used to generate MPI types corresponding to the specific type.
-# 
+#
 # {DIMS} : Rank of arrays, "0" for scalar.
 #                allowed values: 0-7
 #                default values : 0-5
@@ -33,40 +33,46 @@
 #                expands to this:
 #                foo(1, bar), foo(2, bar), foo(3, bar), ...
 
-# defaults 
-my @types = qw(text real double int);
-my $vtype = {'text' => 'character(len=*)', 
-	     'real' => 'real(r4)', 
+# defaults
+my @types = qw(text real double int short);
+my $vtype = {'text' => 'character(len=*)',
+	     'real' => 'real(r4)',
 	     'double' => 'real(r8)',
 	     'int'    => 'integer(i4)',
+	     'short'  => 'integer(i2)',
 	     'long'   => 'integer(i8)',
              'logical' => 'logical' };
-my $itype = {'text' => 100, 
-	     'real' => 101, 
+my $itype = {'text' => 100,
+	     'real' => 101,
 	     'double' => 102,
 	     'int'    => 103,
 	     'long'   => 104,
-             'logical' => 105};
-my $itypename = {'text' => 'TYPETEXT', 
-	     'real' =>  'TYPEREAL', 
+             'logical' => 105,
+             'short'  => 106};
+my $itypename = {'text' => 'TYPETEXT',
+	     'real' =>  'TYPEREAL',
 	     'double' => 'TYPEDOUBLE',
 	     'int'    => 'TYPEINT',
+	     'short'  => 'TYPESHORT',
 	     'long'   =>  'TYPELONG',
              'logical' => 'TYPELOGICAL'};
 my $mpitype = {'text' => 'MPI_CHARACTER',
 	       'real' => 'MPI_REAL4',
+	       'short' => 'MPI_SHORT',
 	       'double' => 'MPI_REAL8',
 	       'int' => 'MPI_INTEGER'};
 # Netcdf C datatypes
 my $nctype = {'text' => 'text',
 	      'real' => 'float',
+	      'short' => 'short',
 	      'double' => 'double',
 	      'int' => 'int'};
 # C interoperability types
 my $ctype = {'text' => 'character(C_CHAR)',
 	     'real' => 'real(C_FLOAT)',
 	     'double' => 'real(C_DOUBLE)',
-	     'int' => 'integer(C_INT)'};
+	     'int' => 'integer(C_INT)',
+             'short' => 'integer(C_SHORT)'};
 
 
 
@@ -108,9 +114,9 @@
     my @unit;
     my $unitcnt=0;
     my $date = localtime();
-    my $preamble = 
+    my $preamble =
 "!===================================================
-! DO NOT EDIT THIS FILE, it was generated using $0 
+! DO NOT EDIT THIS FILE, it was generated using $0
 ! Any changes you make to this file may be lost
 !===================================================\n";
     my @output ;
@@ -134,7 +140,7 @@
 	$itypeflag=1 if($line =~ /TYPEINT/);
 	$itypeflag=1 if($line =~ /TYPELONG/);
 
-	
+
         if($contains==0){
 	    if($line=~/\s*!\s*DIMS\s+[\d,]+!*/){
 		$dimmodifier=$line;
@@ -186,12 +192,12 @@
 	    if(defined $dimmodifier){
 		$line = $dimmodifier.$line;
 		undef $dimmodifier;
-	    } 
+	    }
 	    if(defined $typemodifier){
 		$line = $typemodifier.$line;
 		undef $typemodifier;
-	    } 
-	    
+	    }
+
 	    push(@output, buildout($line));
             if(($line =~ /^\s*contains\s*!*/i && ! $in_type_block) or
                ($line =~ /^\s*!\s*Not a module/i)){
@@ -218,7 +224,7 @@
                 }
 	    }
 
-	       
+
 	    push(@{$unit[$unitcnt]},$line);
 	    if ($line=~/^\s*interface/i) {
 		$block_type="interface";
@@ -242,10 +248,10 @@
 	if(defined($unit[$i])){
 		my $func = join('',@{$unit[$i]});
 		push(@output, buildout($func));
-	}	
+	}
     }
     push(@output,@{$unit[$#unit]}) if($unitcnt==$#unit);
-    push(@output, $end);	
+    push(@output, $end);
     if($itypeflag==1){
 	my $str;
 	$str.="#include \"dtypes.h\"\n";
@@ -283,9 +289,9 @@ sub build_repeatstr{
 
 sub writedtypes{
     open(F,">dtypes.h");
-    print F 
+    print F
 "#define TYPETEXT 100
-#define TYPEREAL 101	
+#define TYPEREAL 101
 #define TYPEDOUBLE 102
 #define TYPEINT 103
 #define TYPELONG 104
@@ -296,7 +302,7 @@ sub writedtypes{
 
 sub buildout{
     my ($func) = @_;
-    
+
     my $outstr;
     my(@ldims, @ltypes);
 
@@ -306,12 +312,12 @@ sub buildout{
 	@ldims = @dims;
     }
     if($func=~/\s*!\s*TYPE\s+([^!\s]+)\s*/){
-	@ltypes = split(/,/,$1);	
+	@ltypes = split(/,/,$1);
 #	print ">$func<>@ltypes<\n";
     }else{
 	@ltypes = @types;
     }
-    
+
 
     if(($func =~ /{TYPE}/ && $func =~ /{DIMS}/) ){
 	my ($type, $dims);
@@ -330,7 +336,7 @@ sub buildout{
 		}
 
 		my $repeatstr = build_repeatstr($dims);
-		
+
 		my $str = $func;
 		$str =~ s/{TYPE}/$type/g;
 		$str =~ s/{VTYPE}/$vtype->{$type}/g;
@@ -358,9 +364,9 @@ sub buildout{
 	    }else{
 		$dimstr='';
 	    }
-		
+
 	    my $repeatstr = build_repeatstr($dims);
-		
+
 	    my $str = $func;
 	    $str =~ s/{DIMS}/$dims/g;
 	    $str =~ s/{DIMSTR}/$dimstr/g;
diff --git a/set_flags.am b/set_flags.am
index 438deee610d..08efa30db22 100644
--- a/set_flags.am
+++ b/set_flags.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/flib -D_NETCDF
 
 # Is the user building with pnetcdf?
 if BUILD_PNETCDF
-AM_CPPFLAGS += -D_PETCDF
+AM_CPPFLAGS += -D_PNETCDF
 endif
 
 # Is the user building with netCDF-4 parallel I/O?
diff --git a/src/clib/pio_darray.c b/src/clib/pio_darray.c
index a9b029c9a82..82d57b38514 100644
--- a/src/clib/pio_darray.c
+++ b/src/clib/pio_darray.c
@@ -988,8 +988,19 @@ PIOc_read_darray(int ncid, int varid, int ioid, PIO_Offset arraylen,
     {
         if (!(tmparray = malloc(iodesc->piotype_size * iodesc->maplen)))
             return pio_err(ios, NULL, PIO_ENOMEM, __FILE__, __LINE__);
-        for (int m = 0; m < iodesc->maplen; m++)
+	if(iodesc->piotype_size == 1){
+	  for (int m = 0; m < iodesc->maplen; m++)
+            ((signed char *)array)[m] = -1;
+	}else if(iodesc->piotype_size == 2){
+	  for (int m = 0; m < iodesc->maplen; m++)
+            ((short *)array)[m] = -1;
+	}else if(iodesc->piotype_size == 4){
+	  for (int m = 0; m < iodesc->maplen; m++)
             ((int *)array)[m] = -1;
+	}else if(iodesc->piotype_size == 8){
+	  for (int m = 0; m < iodesc->maplen; m++)
+            ((double *)array)[m] = -1;
+	}
     }
     else
         tmparray = array;
diff --git a/src/clib/pio_nc.c b/src/clib/pio_nc.c
index 04ba01a5040..64c76e1c04d 100644
--- a/src/clib/pio_nc.c
+++ b/src/clib/pio_nc.c
@@ -2280,8 +2280,8 @@ PIOc_def_var(int ncid, const char *name, nc_type xtype, int ndims,
 #ifdef _NETCDF4
         /* For netCDF-4 serial files, turn on compression for this
          * variable, unless this file was opened through the netCDF
-         * integration feature. */
-        if (!ierr && file->iotype == PIO_IOTYPE_NETCDF4C && !file->ncint_file)
+         * integration feature (or is a scalar). */
+        if (!ierr && file->iotype == PIO_IOTYPE_NETCDF4C && !file->ncint_file && ndims)
             ierr = nc_def_var_deflate(file->fh, varid, 0, 1, 1);
 
         /* For netCDF-4 parallel files, set parallel access to collective. */
diff --git a/src/clib/pio_nc4.c b/src/clib/pio_nc4.c
index 7dc7a7445c5..ef18118fe00 100644
--- a/src/clib/pio_nc4.c
+++ b/src/clib/pio_nc4.c
@@ -49,6 +49,9 @@ PIOc_def_var_deflate(int ncid, int varid, int shuffle, int deflate,
     if (file->iotype != PIO_IOTYPE_NETCDF4P && file->iotype != PIO_IOTYPE_NETCDF4C)
         return pio_err(ios, file, PIO_ENOTNC4, __FILE__, __LINE__);
 
+    PLOG((1, "PIOc_def_var_deflate ncid = %d varid = %d shuffle = %d deflate = %d deflate_level = %d",
+	  ncid, varid, shuffle, deflate, deflate_level));
+
     /* If async is in use, and this is not an IO task, bcast the parameters. */
     if (ios->async)
     {
@@ -116,7 +119,7 @@ PIOc_def_var_deflate(int ncid, int varid, int shuffle, int deflate,
  * @param deflatep pointer to an int that will be set to non-zero if
  * deflation is in use for this variable. Ignored if NULL.
  * @param deflate_levelp pointer to an int that will get the deflation
- * level (from 1-9) if deflation is in use for this variable.  Ignored
+ * level (from 1-9) if deflation is in use for this variable. Ignored
  * if NULL.
  * @return PIO_NOERR for success, otherwise an error code.
  * @ingroup PIO_inq_var_c
@@ -140,6 +143,8 @@ PIOc_inq_var_deflate(int ncid, int varid, int *shufflep, int *deflatep,
     if (file->iotype != PIO_IOTYPE_NETCDF4P && file->iotype != PIO_IOTYPE_NETCDF4C)
         return pio_err(ios, file, PIO_ENOTNC4, __FILE__, __LINE__);
 
+    PLOG((1, "PIOc_inq_var_deflate ncid = %d varid = %d", ncid, varid));
+
     /* If async is in use, and this is not an IO task, bcast the parameters. */
     if (ios->async)
     {
diff --git a/src/flib/CMakeLists.txt b/src/flib/CMakeLists.txt
index d70dae8a5d5..0f0c3ffd089 100644
--- a/src/flib/CMakeLists.txt
+++ b/src/flib/CMakeLists.txt
@@ -116,7 +116,7 @@ else ()
   ExternalProject_Add (genf90
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/genf90
     GIT_REPOSITORY https://github.com/PARALLELIO/genf90
-    GIT_TAG genf90_140121
+    GIT_TAG genf90_200608
     UPDATE_COMMAND ""
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
diff --git a/src/flib/Makefile.am b/src/flib/Makefile.am
index 8c23c8033e5..0a7966636f3 100644
--- a/src/flib/Makefile.am
+++ b/src/flib/Makefile.am
@@ -7,7 +7,7 @@
 # The library we are building.
 lib_LTLIBRARIES = libpiof.la
 
-AM_CPPFLAGS = -D_NETCDF -D_NETCDF4 -D_PETCDF
+AM_CPPFLAGS = -D_NETCDF -D_NETCDF4 -D_PNETCDF
 
 # These linker flags specify libtool version info.
 # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
diff --git a/src/flib/pio.F90 b/src/flib/pio.F90
index 19bf75cec78..a14a8af9912 100644
--- a/src/flib/pio.F90
+++ b/src/flib/pio.F90
@@ -1,5 +1,5 @@
 !>
-!! @file 
+!! @file
 !! User interface Module for PIO, this is the only file a user program should 'use'.
 !! @author Jim Edwards
 !<
@@ -33,7 +33,7 @@ module pio
        pio_rearr_opt_t, pio_rearr_comm_fc_opt_t, pio_rearr_comm_fc_2d_enable,&
        pio_rearr_comm_fc_1d_comp2io, pio_rearr_comm_fc_1d_io2comp,&
        pio_rearr_comm_fc_2d_disable, pio_rearr_comm_unlimited_pend_req,&
-       pio_rearr_comm_p2p, pio_rearr_comm_coll,&
+       pio_rearr_comm_p2p, pio_rearr_comm_coll, pio_short, &
        pio_int, pio_real, pio_double, pio_noerr, iotype_netcdf, &
        iotype_pnetcdf,  pio_iotype_netcdf4p, pio_iotype_netcdf4c, &
        pio_iotype_pnetcdf,pio_iotype_netcdf, &
@@ -45,7 +45,7 @@ module pio
        pio_64bit_offset, pio_64bit_data, &
        pio_internal_error, pio_bcast_error, pio_return_error, pio_default
 
-  use piodarray, only : pio_read_darray, pio_write_darray, pio_set_buffer_size_limit  
+  use piodarray, only : pio_read_darray, pio_write_darray, pio_set_buffer_size_limit
 
   use pio_nf, only:        &
        PIO_enddef,            &
@@ -124,11 +124,11 @@ integer(C_INT) function PIOc_iam_iotask(iosysid, iotask) &
          logical(C_BOOL), intent(out) :: iotask
        end function PIOc_iam_iotask
     end interface
-    
+
     ierr = PIOc_iam_iotask(iosystem%iosysid, ctask)
     task = ctask
   end function pio_iam_iotask
-  
+
   !>
   !! Integer function returns rank of IO task.
   !! @author Jim Edwards
@@ -144,7 +144,7 @@ integer(C_INT) function PIOc_iotask_rank(iosysid, rank) &
          integer(C_INT), intent(out) :: rank
        end function PIOc_iotask_rank
     end interface
-    
+
     ierr = PIOc_iotask_rank(iosystem%iosysid, rank)
   end function pio_iotask_rank
 
@@ -172,4 +172,3 @@ end function PIOc_iosystem_is_active
   end subroutine pio_iosystem_is_active
 
 end module pio
-
diff --git a/src/flib/pio_kinds.F90 b/src/flib/pio_kinds.F90
index 8e4148c23f2..c5074c1f850 100644
--- a/src/flib/pio_kinds.F90
+++ b/src/flib/pio_kinds.F90
@@ -22,12 +22,13 @@ module pio_kinds
       char_len  = 360                    ,& !< char len
       log_kind  = kind(.true.)           ,& !< logical kind
       int_kind  = kind(1)                ,& !< int kind
+      i2        = selected_int_kind(4)   ,& !< i2 (short) kind
       i4        = selected_int_kind(6)   ,& !< i4 kind
       i8        = selected_int_kind(13)  ,& !< i8 kind
       r4        = selected_real_kind(6)  ,& !< r4 kind
       r8        = selected_real_kind(13)    !< r8 kind
 !
-!  MPI defines MPI_OFFSET_KIND as the byte size of the 
+!  MPI defines MPI_OFFSET_KIND as the byte size of the
 !  type, which is not nessasarily the type kind
 !
 !> Byte size of the MPI_OFFSET type.
diff --git a/src/flib/pio_types.F90 b/src/flib/pio_types.F90
index aeba6349b7a..a8d453edc6e 100644
--- a/src/flib/pio_types.F90
+++ b/src/flib/pio_types.F90
@@ -35,9 +35,10 @@
 !!
 !! @defgroup PIO_kinds PIO Fortran Type Kinds
 !! PIO supports different kinds of Fortran types.
-!!  - PIO_double : 8-byte reals or double precision
+!!  - PIO_doauble : 8-byte reals or double precision
 !!  - PIO_real : 4-byte reals
 !!  - PIO_int :  4-byte integers
+!!  - PIO_short : 2-byte integers
 !!  - PIO_char : character
 
 module pio_types
@@ -136,6 +137,7 @@ module pio_types
   integer, public, parameter :: PIO_double = nf_double       !< double type
   integer, public, parameter :: PIO_real   = nf_real         !< real type
   integer, public, parameter :: PIO_int    = nf_int          !< int type
+  integer, public, parameter :: PIO_short  = nf_short        !< short int type
   integer, public, parameter :: PIO_char   = nf_char         !< char type
   integer, public, parameter :: PIO_noerr  = nf_noerr        !< no error
   integer, public, parameter :: PIO_WRITE  = nf_write        !< read-write
diff --git a/src/flib/piodarray.F90.in b/src/flib/piodarray.F90.in
index 8569878c688..dfd2b5339a2 100644
--- a/src/flib/piodarray.F90.in
+++ b/src/flib/piodarray.F90.in
@@ -13,7 +13,7 @@
 !<
 module piodarray
   use pio_types, only : file_desc_t, io_desc_t, var_desc_t
-  use pio_kinds, only : i4, r4, r8, pio_offset_kind
+  use pio_kinds, only : i2, i4, r4, r8, pio_offset_kind
   use pio_support, only : piodie
   use iso_c_binding
 #ifdef TIMING
@@ -25,15 +25,15 @@ module piodarray
   public :: pio_read_darray, pio_write_darray, pio_set_buffer_size_limit
 
   interface PIO_write_darray
-! TYPE real,int,double
+! TYPE real,int,double,short
 ! DIMS 1,2,3,4,5,6,7
      module procedure write_darray_{DIMS}d_{TYPE}
-! TYPE real,int,double
+! TYPE real,int,double,short
      module procedure write_darray_multi_1d_{TYPE}
   end interface
 
   interface PIO_read_darray
-! TYPE real,int,double
+! TYPE real,int,double,short
 ! DIMS 1,2,3,4,5,6,7
      module procedure read_darray_{DIMS}d_{TYPE}
   end interface
@@ -100,7 +100,7 @@ contains
 
   end subroutine pio_set_buffer_size_limit
 
-! TYPE real,int,double
+! TYPE real,int,double,short
   !> 1D write_darray for type {TYPE}. Writes a 2-d slab of TYPE to a
   !! netcdf file.
   !<
@@ -139,7 +139,7 @@ contains
 #endif
   end subroutine write_darray_1d_cinterface_{TYPE}
 
-! TYPE real,int,double
+! TYPE real,int,double,short
   !> 1D write_darray_multi for type {TYPE}. Writes a 2-d slab of TYPE to a netcdf file.
   subroutine write_darray_multi_1d_cinterface_{TYPE} (File,varDesc,ioDesc,nvars,arraylen, array, iostat, fillval)
     use iso_c_binding
@@ -179,7 +179,7 @@ contains
 
   end subroutine write_darray_multi_1d_cinterface_{TYPE}
 
-! TYPE real,int,double
+! TYPE real,int,double,short
   !>
   !! @ingroup PIO_write_darray
   !! Writes a 1D array of type {TYPE}. Writes a block of TYPE to a netcdf file.
@@ -217,7 +217,7 @@ contains
 
   end subroutine write_darray_multi_1d_{TYPE}
 
-! TYPE real,int,double
+! TYPE real,int,double,short
   !> Writes a block of TYPE to a netcdf file.
   subroutine write_darray_1d_{TYPE} (File,varDesc,ioDesc, array, iostat, fillval)
     type (File_desc_t), intent(inout) :: &
@@ -241,7 +241,7 @@ contains
 
   end subroutine write_darray_1d_{TYPE}
 
-! TYPE real,int,double
+! TYPE real,int,double,short
 ! DIMS 2,3,4,5,6,7
   !>
   !! @ingroup PIO_write_darray
@@ -294,7 +294,7 @@ contains
 #endif
   end subroutine write_darray_{DIMS}d_{TYPE}
 
-! TYPE real,int,double
+! TYPE real,int,double,short
 ! DIMS 1,2,3,4,5,6,7
   !>
   !! @ingroup PIO_read_darray
@@ -309,7 +309,6 @@ contains
   !<
   subroutine read_darray_{DIMS}d_{TYPE} (File,varDesc, ioDesc, array, iostat)
     use iso_c_binding
-!    use ifcore, only: tracebackqq
 
     type (File_desc_t), intent(inout) :: &
          File                   ! file information
@@ -330,7 +329,7 @@ contains
 
   end subroutine read_darray_{DIMS}d_{TYPE}
 
-! TYPE real,int,double
+! TYPE real,int,double,short
   !> Internal read_darray for type {TYPE}
   subroutine read_darray_internal_{TYPE} (ncid, varid, ioid, alen, array, iostat)
     use iso_c_binding
diff --git a/src/flib/pionfatt_mod.F90.in b/src/flib/pionfatt_mod.F90.in
index 01952b2bd85..cc4a3cd409d 100644
--- a/src/flib/pionfatt_mod.F90.in
+++ b/src/flib/pionfatt_mod.F90.in
@@ -13,7 +13,7 @@
 !<
 
 module pionfatt_mod
-  use pio_kinds, only : r4, r8, i4, pio_offset_kind
+  use pio_kinds, only : r4, r8, i4, i2, pio_offset_kind
   use pio_types
   use pio_support, only : replace_c_null
   use iso_c_binding
@@ -26,11 +26,11 @@ module pionfatt_mod
   public :: put_att
   interface put_att
      module procedure put_att_id_{TYPE}, put_att_desc_{TYPE}, put_att_vid_{TYPE}
-     ! TYPE real,int,double
+     ! TYPE real,int,double,short
      module procedure put_att_1d_id_{TYPE}
-     ! TYPE real,int,double
+     ! TYPE real,int,double,short
      module procedure put_att_1d_desc_{TYPE}
-     ! TYPE real,int,double
+     ! TYPE real,int,double,short
      module procedure put_att_1d_vid_{TYPE}
   end interface
 
@@ -41,7 +41,7 @@ module pionfatt_mod
   public :: get_att
   interface get_att
      module procedure get_att_{TYPE}, get_att_desc_{TYPE}, get_att_id_{TYPE}
-     ! TYPE real,int,double
+     ! TYPE real,int,double,short
      module procedure get_att_1d_{TYPE}, get_att_desc_1d_{TYPE}, get_att_1d_id_{TYPE}
   end interface
 
@@ -70,18 +70,29 @@ module pionfatt_mod
      end function PIOc_get_att_text
   end interface
 
-
   interface
-     integer(C_INT) function PIOc_put_att_int (ncid, varid, name, xtype, len, op) &
-          bind(C,name="PIOc_put_att_int")
+     ! TYPE int,double,short
+     integer(C_INT) function PIOc_put_att_{TYPE} (ncid, varid, name, xtype, len, op) &
+          bind(C,name="PIOc_put_att_{TYPE}")
        use iso_c_binding
        integer(C_INT), value    :: ncid
        integer(C_INT), value    :: varid
        character(C_CHAR)        :: name(*)
        integer(C_INT), value    :: xtype
        integer(C_SIZE_T), value :: len
-       integer(C_INT)           :: op
-     end function PIOc_put_att_int
+       {CTYPE}                  :: op
+     end function PIOc_put_att_{TYPE}
+  end interface
+  interface
+     ! TYPE int,double,short
+     integer(C_INT) function PIOc_get_att_{TYPE} (ncid, varid, name, op) &
+          bind(C,name="PIOc_get_att_{TYPE}")
+       use iso_c_binding
+       integer(C_INT), value         :: ncid
+       integer(C_INT), value         :: varid
+       character(C_CHAR)             :: name(*)
+       {CTYPE},        intent(out)   :: op
+     end function PIOc_get_att_{TYPE}
   end interface
   interface
      integer(C_INT) function PIOc_put_att_float (ncid, varid, name, xtype, len, op) &
@@ -96,51 +107,16 @@ module pionfatt_mod
      end function PIOc_put_att_float
   end interface
   interface
-     integer(C_INT) function PIOc_put_att_double (ncid, varid, name, xtype, len, op) &
-          bind(C,name="PIOc_put_att_double")
-       use iso_c_binding
-       integer(C_INT), value    :: ncid
-       integer(C_INT), value    :: varid
-       character(C_CHAR)        :: name(*)
-       integer(C_INT), value    :: xtype
-       integer(C_SIZE_T), value :: len
-       real(C_DOUBLE)           :: op
-     end function PIOc_put_att_double
-  end interface
-
-
-  interface
-     integer(C_INT) function PIOc_get_att_int (ncid, varid, name, op) &
-          bind(C,name="PIOc_get_att_int")
-       use iso_c_binding
-       integer(C_INT), value         :: ncid
-       integer(C_INT), value         :: varid
-       character(C_CHAR)             :: name(*)
-       integer(C_INT), intent(out)   :: op
-     end function PIOc_get_att_int
-  end interface
-
-  interface
+     ! TYPE int,double,short
      integer(C_INT) function PIOc_get_att_float (ncid, varid, name, op) &
           bind(C,name="PIOc_get_att_float")
        use iso_c_binding
        integer(C_INT), value         :: ncid
        integer(C_INT), value         :: varid
        character(C_CHAR)             :: name(*)
-       real(C_FLOAT), intent(out) :: op
+       real(C_FLOAT),        intent(out)   :: op
      end function PIOc_get_att_float
   end interface
-
-  interface
-     integer(C_INT) function PIOc_get_att_double (ncid, varid, name, op) &
-          bind(C,name="PIOc_get_att_double")
-       use iso_c_binding
-       integer(C_INT), value         :: ncid
-       integer(C_INT), value         :: varid
-       character(C_CHAR)             :: name(*)
-       real(C_DOUBLE), intent(out)   :: op
-     end function PIOc_get_att_double
-  end interface
   !> @endcond
 
 contains
@@ -174,7 +150,7 @@ contains
     ierr = put_att_id_{TYPE} (File%fh,varid,name,value)
 
   end function put_att_vid_{TYPE}
-  ! TYPE int,real,double
+  ! TYPE int,real,double,short
   integer function put_att_id_{TYPE} (ncid, varid, name, values) result(ierr)
     use iso_c_binding
     integer, intent(in) :: ncid
@@ -262,7 +238,7 @@ contains
   end function get_att_id_text
 
   !pl The next line is needed by genf90.pl, do not remove it.
-  ! TYPE real,double,int
+  ! TYPE real,double,int,short
   !>
   !! @public
   !! @ingroup PIO_put_att
@@ -286,7 +262,7 @@ contains
 
   end function put_att_1d_id_{TYPE}
 
-  ! TYPE real,double,int
+  ! TYPE real,double,int,short
   integer function put_att_1d_id_internal_{TYPE} (ncid, varid, name, len, values) result(ierr)
     integer, intent(in) :: ncid
     integer, intent(in) :: varid
@@ -300,7 +276,7 @@ contains
   end function put_att_1d_id_internal_{TYPE}
 
 
-  ! TYPE real,int,double
+  ! TYPE real,int,double,short
   !>
   !! @public
   !! @ingroup PIO_put_att
@@ -367,7 +343,7 @@ contains
   !! @param values : The value for the netcdf attribute
   !! @retval ierr @copydoc error_return
   !<
-  ! TYPE int,real,double
+  ! TYPE int,real,double,short
   integer function get_att_desc_1d_{TYPE} (File,varDesc,name,values) result(ierr)
 
     type (File_desc_t), intent(inout) , target :: File
@@ -392,7 +368,7 @@ contains
   !! @param values : The value for the netcdf attribute
   !! @retval ierr @copydoc error_return
   !<
-  ! TYPE int,real,double
+  ! TYPE int,real,double,short
   integer function get_att_id_{TYPE} (ncid, varid, name, values) result(ierr)
     use iso_c_binding
     integer, intent(in) :: ncid
@@ -419,7 +395,7 @@ contains
 
   end function get_att_{TYPE}
 
-  ! TYPE real,int,double
+  ! TYPE real,int,short,double
   !>
   !! @public
   !! @ingroup PIO_get_att
@@ -442,7 +418,7 @@ contains
   end function get_att_1d_{TYPE}
 
 
-  ! TYPE real,int,double
+  ! TYPE real,int,short,double
   integer function get_att_1d_id_{TYPE} (ncid,varid,name,values) result(ierr)
     integer, intent(in) :: ncid
     integer(i4), intent(in)        :: varid
diff --git a/src/flib/pionfget_mod.F90.in b/src/flib/pionfget_mod.F90.in
index 17fe764b951..3fe5462d95a 100644
--- a/src/flib/pionfget_mod.F90.in
+++ b/src/flib/pionfget_mod.F90.in
@@ -15,7 +15,7 @@ module pionfget_mod
 #ifdef TIMING
   use perf_mod, only : t_startf, t_stopf      ! _EXTERNAL
 #endif
-  use pio_kinds, only: i4,r4,r8
+  use pio_kinds, only: i2,i4,r4,r8
   use pio_types, only : file_desc_t, var_desc_t
   use pio_support, only : replace_c_null
   implicit none
@@ -30,24 +30,6 @@ module pionfget_mod
 
  character(len=*), parameter :: modName='pionfget_mod'
 
- interface
-    integer(C_INT) function PIOc_get_var_text (ncid, varid, ival) &
-         bind(C,name="PIOc_get_var_text")
-      use iso_c_binding
-      integer(C_INT), value :: ncid
-      integer(C_INT), value :: varid
-      character(C_CHAR) :: ival(*)
-    end function PIOc_get_var_text
- end interface
- interface
-    integer(C_INT) function PIOc_get_var_int (ncid, varid, ival) &
-         bind(C,name="PIOc_get_var_int")
-      use iso_c_binding
-      integer(C_INT), value :: ncid
-      integer(C_INT), value :: varid
-      integer(C_INT) :: ival(*)
-    end function PIOc_get_var_int
- end interface
  interface
     integer(C_INT) function PIOc_get_var_float (ncid, varid, ival) &
          bind(C,name="PIOc_get_var_float")
@@ -58,25 +40,28 @@ module pionfget_mod
     end function PIOc_get_var_float
  end interface
  interface
-    integer(C_INT) function PIOc_get_var_double (ncid, varid, ival) &
-         bind(C,name="PIOc_get_var_double")
+    ! TYPE text,double,short,int
+    integer(C_INT) function PIOc_get_var_{TYPE} (ncid, varid, ival) &
+         bind(C,name="PIOc_get_var_{TYPE}")
       use iso_c_binding
       integer(C_INT), value :: ncid
       integer(C_INT), value :: varid
-      real(C_DOUBLE) :: ival(*)
-    end function PIOc_get_var_double
+      {CTYPE} :: ival(*)
+    end function PIOc_get_var_{TYPE}
  end interface
 
+
  interface
-    integer(C_INT) function PIOc_get_vara_int (ncid, varid, start, count, ival) &
-         bind(C,name="PIOc_get_vara_int")
+    !TYPE int,double,short,text
+    integer(C_INT) function PIOc_get_vara_{TYPE} (ncid, varid, start, count, ival) &
+         bind(C,name="PIOc_get_vara_{TYPE}")
       use iso_c_binding
       integer(C_INT), value :: ncid
       integer(C_INT), value :: varid
       integer(C_SIZE_T)  :: start(*)
       integer(C_SIZE_T)  :: count(*)
-      integer(C_INT)  :: ival(*)
-    end function PIOc_get_vara_int
+      {CTYPE}  :: ival(*)
+    end function PIOc_get_vara_{TYPE}
  end interface
  interface
     integer(C_INT) function PIOc_get_vara_float (ncid, varid, start, count, ival) &
@@ -89,28 +74,7 @@ module pionfget_mod
       real(C_FLOAT)  :: ival(*)
     end function PIOc_get_vara_float
  end interface
- interface
-    integer(C_INT) function PIOc_get_vara_double (ncid, varid, start, count, ival) &
-         bind(C,name="PIOc_get_vara_double")
-      use iso_c_binding
-      integer(C_INT), value :: ncid
-      integer(C_INT), value :: varid
-      integer(C_SIZE_T)  :: start(*)
-      integer(C_SIZE_T)  :: count(*)
-      real(C_DOUBLE)  :: ival(*)
-    end function PIOc_get_vara_double
- end interface
- interface
-    integer(C_INT) function PIOc_get_vara_text (ncid, varid, start, count, ival) &
-         bind(C,name="PIOc_get_vara_text")
-      use iso_c_binding
-      integer(C_INT), value :: ncid
-      integer(C_INT), value :: varid
-      integer(C_SIZE_T)  :: start(*)
-      integer(C_SIZE_T)  :: count(*)
-      character(C_CHAR)  :: ival(*)
-    end function PIOc_get_vara_text
- end interface
+
 CONTAINS
 
 !>
@@ -133,7 +97,7 @@ CONTAINS
     ierr = get_var1_id_{TYPE} (file%fh, varid, index, ival)
 
   end function get_var1_{TYPE}
-! TYPE int,real,double
+! TYPE int,real,double,short
   integer function get_var1_id_{TYPE} (ncid,varid, index, ival) result(ierr)
     integer, intent(in) :: ncid
     integer, intent(in) :: varid, index(:)
@@ -258,7 +222,7 @@ CONTAINS
   end function get_var1_vdesc_{TYPE}
 
 
-! TYPE int,real,double
+! TYPE int,real,double,short
 ! DIMS 1,2,3,4,5
 !>
 !! @public
@@ -371,7 +335,7 @@ CONTAINS
   end function Get_var_0d_text
 
 
-! TYPE int,real,double
+! TYPE int,real,double,short
 ! DIMS 0
   integer function get_var_0d_{TYPE} (File,varid, ival) result(ierr)
     use iso_c_binding
@@ -410,7 +374,7 @@ CONTAINS
 
   end function get_var_text_internal
 
-! TYPE int,real,double
+! TYPE int,real,double,short
   integer function get_var_{TYPE}_internal  (ncid,varid, ival) result(ierr)
     integer, intent(in) :: ncid
     integer, intent(in) :: varid
@@ -420,7 +384,7 @@ CONTAINS
 
   end function get_var_{TYPE}_internal
 
-! TYPE int,real,double
+! TYPE int,real,double,short
   integer function get_vara_{TYPE}_internal  (ncid,varid, start, count, ival) result(ierr)
     use pio_nf, only : pio_inq_varndims
     integer, intent(in) :: ncid
@@ -469,7 +433,7 @@ CONTAINS
     deallocate(ccount, cstart)
   end function get_vara_text_internal
 
-! TYPE int,real,double
+! TYPE int,real,double,short
 ! DIMS 1,2,3,4,5
   integer function get_var_{DIMS}d_{TYPE} (File,varid, ival) result(ierr)
     type (File_desc_t), intent(in) :: File
diff --git a/src/flib/pionfput_mod.F90.in b/src/flib/pionfput_mod.F90.in
index e58032a4fcc..fd2231305d0 100644
--- a/src/flib/pionfput_mod.F90.in
+++ b/src/flib/pionfput_mod.F90.in
@@ -14,7 +14,7 @@ module pionfput_mod
   use perf_mod, only : t_startf, t_stopf      ! _EXTERNAL
 #endif
   use iso_c_binding
-  use pio_kinds, only: i4,r4,r8
+  use pio_kinds, only: i2,i4,r4,r8
   use pio_types, only : file_desc_t, var_desc_t, pio_noerr
 
   implicit none
@@ -31,35 +31,26 @@ module pionfput_mod
      module procedure put_var1_{TYPE}, put_var1_vdesc_{TYPE}
   end interface
   interface
-     integer(C_INT) function PIOc_put_var_text(ncid, varid, op) &
-          bind(C,name="PIOc_put_var_text")
+     !TYPE text,int,double,short
+     integer(C_INT) function PIOc_put_var_{TYPE}(ncid, varid, op) &
+          bind(C,name="PIOc_put_var_{TYPE}")
        use iso_c_binding
        integer(C_INT), intent(in), value :: ncid
        integer(C_INT), intent(in), value :: varid
-       character(C_CHAR) :: op(*)
-     end function PIOc_put_var_text
+       {CTYPE} :: op(*)
+     end function PIOc_put_var_{TYPE}
   end interface
   interface
-     integer(C_INT) function PIOc_put_vara_text(ncid, varid, start, count, op) &
-          bind(C,name="PIOc_put_vara_text")
+     ! TYPE text,int,double,short
+     integer(C_INT) function PIOc_put_vara_{TYPE}(ncid, varid, start, count, op) &
+          bind(C,name="PIOc_put_vara_{TYPE}")
        use iso_c_binding
        integer(C_INT), intent(in), value :: ncid
        integer(C_INT), intent(in), value :: varid
        integer(C_SIZE_T), intent(in) :: start(*)
        integer(C_SIZE_T), intent(in) :: count(*)
-       character(C_CHAR), intent(in) :: op(*)
-     end function PIOc_put_vara_text
-  end interface
-  interface
-     integer(C_INT) function PIOc_put_vara_int(ncid, varid, start, count, op) &
-          bind(C,name="PIOc_put_vara_int")
-       use iso_c_binding
-       integer(C_INT), intent(in), value :: ncid
-       integer(C_INT), intent(in), value :: varid
-       integer(C_SIZE_T), intent(in) :: start(*)
-       integer(C_SIZE_T), intent(in) :: count(*)
-       integer(C_INT)   , intent(in) :: op(*)
-     end function PIOc_put_vara_int
+       {CTYPE}, intent(in) :: op(*)
+     end function PIOc_put_vara_{TYPE}
   end interface
   interface
      integer(C_INT) function PIOc_put_vara_float(ncid, varid, start, count, op) &
@@ -72,20 +63,6 @@ module pionfput_mod
        real(C_FLOAT)   , intent(in) :: op(*)
      end function PIOc_put_vara_float
   end interface
-  interface
-     integer(C_INT) function PIOc_put_vara_double(ncid, varid, start, count, op) &
-          bind(C,name="PIOc_put_vara_double")
-       use iso_c_binding
-       integer(C_INT), intent(in), value :: ncid
-       integer(C_INT), intent(in), value :: varid
-       integer(C_SIZE_T), intent(in) :: start(*)
-       integer(C_SIZE_T), intent(in) :: count(*)
-       real(C_DOUBLE)   , intent(in) :: op(*)
-     end function PIOc_put_vara_double
-  end interface
-
-
-
 
 contains
 
@@ -123,7 +100,7 @@ contains
      ierr = put_vara_1d_text(File,varid, index, count, cval)
     deallocate(count)
   end function put_var1_text
-! TYPE int,real,double
+! TYPE int,real,double,short
 !>
 !! @public
 !! @ingroup PIO_put_var
@@ -257,7 +234,7 @@ contains
   end function put_var_{DIMS}d_text
 
 ! DIMS 1,2,3,4,5
-! TYPE int,real,double
+! TYPE int,real,double,short
 !>
 !! @public
 !! @ingroup PIO_put_var
@@ -289,7 +266,7 @@ contains
   end function put_var_internal_{TYPE}
 
 ! DIMS 1,2,3,4,5
-! TYPE int,real,double
+! TYPE int,real,double,short
 !>
 !! @public
 !! @ingroup PIO_put_var
@@ -315,7 +292,7 @@ contains
 
   end function put_var_{DIMS}d_{TYPE}
 
-! TYPE int,real,double
+! TYPE int,real,double,short
 !>
 !! @public
 !! @ingroup PIO_put_var
@@ -344,7 +321,7 @@ contains
   end function put_var_0d_{TYPE}
 
 
-! TYPE int,real,double
+! TYPE int,real,double,short
   integer function put_vara_internal_{TYPE} (ncid,varid,start,count, ival) result(ierr)
     integer, intent(in) :: ncid
     integer, intent(in) :: varid
@@ -540,9 +517,7 @@ contains
 
   end subroutine Fstring2Cstring_{DIMS}d
 
-
-
-! TYPE int,real,double
+! TYPE int,real,double,short
 ! DIMS 1,2,3,4,5
 !>
 !! @public
diff --git a/src/ncint/ncintdispatch.c b/src/ncint/ncintdispatch.c
index 687ed57c505..6cd39f3caa2 100644
--- a/src/ncint/ncintdispatch.c
+++ b/src/ncint/ncintdispatch.c
@@ -24,11 +24,15 @@ int diosysid;
 /** Did we initialize user-defined format? */
 int ncint_initialized = 0;
 
+/** Version of dispatch table. */
+#define DISPATCH_VERSION 2
+
 /* This is the dispatch object that holds pointers to all the
  * functions that make up the NCINT dispatch interface. */
 NC_Dispatch NCINT_dispatcher = {
 
     NC_FORMATX_UDF0,
+    DISPATCH_VERSION,
 
     PIO_NCINT_create,
     PIO_NCINT_open,
@@ -111,7 +115,8 @@ NC_Dispatch NCINT_dispatcher = {
     NC_NOTNC4_def_var_endian,
     NC_NOTNC4_def_var_filter,
     NC_NOTNC4_set_var_chunk_cache,
-    NC_NOTNC4_get_var_chunk_cache
+    NC_NOTNC4_get_var_chunk_cache,
+    NC_NOTNC4_filter_actions
 };
 
 /**
diff --git a/src/ncint/ncintdispatch.h b/src/ncint/ncintdispatch.h
index 795f73eeb4e..5e0e8d4ba00 100644
--- a/src/ncint/ncintdispatch.h
+++ b/src/ncint/ncintdispatch.h
@@ -145,8 +145,6 @@ extern "C" {
     PIO_NCINT_inq_type_equal(int ncid1, nc_type typeid1, int ncid2,
                              nc_type typeid2, int *equalp);
 
-
-
 #if defined(__cplusplus)
 }
 #endif
diff --git a/tests/cunit/test_async_3proc.c b/tests/cunit/test_async_3proc.c
index 8eff69fdf24..ea89084c5ca 100644
--- a/tests/cunit/test_async_3proc.c
+++ b/tests/cunit/test_async_3proc.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
             {
                 for (int flv = 0; flv < num_flavors; flv++)
                 {
-                    char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+                    char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
                     int my_comp_idx = 0; /* Index in iosysid array. */
 
                     for (int sample = 0; sample < NUM_SAMPLES; sample++)
diff --git a/tests/cunit/test_async_4proc.c b/tests/cunit/test_async_4proc.c
index 833110388f3..20395a74f5b 100644
--- a/tests/cunit/test_async_4proc.c
+++ b/tests/cunit/test_async_4proc.c
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
             {
                 for (int flv = 0; flv < num_flavors; flv++)
                 {
-                    char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+                    char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
                     int my_comp_idx = 0; /* Index in iosysid array. */
 
                     for (int sample = 0; sample < NUM_SAMPLES; sample++)
diff --git a/tests/cunit/test_async_simple.c b/tests/cunit/test_async_simple.c
index d8520efbd32..1ae6c6b0c0e 100644
--- a/tests/cunit/test_async_simple.c
+++ b/tests/cunit/test_async_simple.c
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
 
                 for (int sample = 0; sample < NUM_SAMPLES; sample++)
                 {
-                    char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+                    char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
                     char iotype_name[PIO_MAX_NAME + 1];
 
                     /* Create a filename. */
diff --git a/tests/cunit/test_pioc.c b/tests/cunit/test_pioc.c
index 9bdb0560351..c85e341e4ab 100644
--- a/tests/cunit/test_pioc.c
+++ b/tests/cunit/test_pioc.c
@@ -838,7 +838,7 @@ int test_names(int iosysid, int num_flavors, int *flavor, int my_rank,
     {
         int ncid;
         int varid;
-        char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+        char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
         char iotype_name[PIO_MAX_NAME + 1];
         int dimids[NDIM];        /* The dimension IDs. */
         int att_val = ATT_VAL;
@@ -942,7 +942,7 @@ int test_files(int iosysid, int num_flavors, int *flavor, int my_rank)
      * available ways. */
     for (int fmt = 0; fmt < num_flavors; fmt++)
     {
-        char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+        char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
         char iotype_name[PIO_MAX_NAME + 1];
 
         /* Overwrite existing test file. */
@@ -1041,7 +1041,7 @@ int test_empty_files(int iosysid, int num_flavors, int *flavor, int my_rank)
      * available ways. */
     for (int fmt = 0; fmt < num_flavors; fmt++)
     {
-        char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+        char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
         char iotype_name[PIO_MAX_NAME + 1];
 
         /* Create a filename. */
@@ -1218,7 +1218,7 @@ int test_find_var_fillvalue(int iosysid, int num_flavors, int *flavor,
      * available ways. */
     for (int fmt = 0; fmt < num_flavors; fmt++)
     {
-        char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+        char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
         char iotype_name[PIO_MAX_NAME + 1];
         int num_types = NUM_CLASSIC_TYPES;
 
@@ -1370,7 +1370,7 @@ int test_deletefile(int iosysid, int num_flavors, int *flavor, int my_rank)
      * available ways. */
     for (int fmt = 0; fmt < num_flavors; fmt++)
     {
-        char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+        char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
         char iotype_name[PIO_MAX_NAME + 1];
         int old_method;
 
@@ -1456,7 +1456,7 @@ int test_nc4(int iosysid, int num_flavors, int *flavor, int my_rank)
      * available ways. */
     for (int fmt = 0; fmt < num_flavors; fmt++)
     {
-        char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+        char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
         char iotype_name[PIO_MAX_NAME + 1];
 
         /* Create a filename. */
@@ -1793,7 +1793,7 @@ int test_scalar(int iosysid, int num_flavors, int *flavor, int my_rank, int asyn
      * available ways. */
     for (int fmt = 0; fmt < num_flavors; fmt++)
     {
-        char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+        char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
         char iotype_name[PIO_MAX_NAME + 1];
 
         /* Create a filename. */
diff --git a/tests/cunit/test_pioc_fill.c b/tests/cunit/test_pioc_fill.c
index 82963142095..8b502fed124 100644
--- a/tests/cunit/test_pioc_fill.c
+++ b/tests/cunit/test_pioc_fill.c
@@ -538,7 +538,7 @@ int test_fill(int iosysid, int num_flavors, int *flavor, int my_rank,
          * available ways. */
         for (int fmt = 0; fmt < num_flavors; fmt++)
         {
-            char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+            char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
             char iotype_name[PIO_MAX_NAME + 1];
             int ncid;
             int varid[NUM_NETCDF_TYPES];
@@ -547,7 +547,8 @@ int test_fill(int iosysid, int num_flavors, int *flavor, int my_rank,
             /* Create a filename. */
             if ((ret = get_iotype_name(flavor[fmt], iotype_name)))
                 ERR(ret);
-            snprintf(filename, PIO_MAX_NAME, "%s_default_fill_%d_%s.nc", TEST_NAME, default_fill, iotype_name);
+            snprintf(filename, PIO_MAX_NAME * 2, "%s_default_fill_%d_%s.nc", TEST_NAME,
+		     default_fill, iotype_name);
 
             /* Create test file with dims and vars defined. */
             if ((ret = create_putget_file(iosysid, flavor[fmt], dim_len, varid, filename,
@@ -635,7 +636,7 @@ int test_fill_mode(int iosysid, int num_flavors, int *flavor, int my_rank,
             {
                 for (int t = 0; t < NUM_TYPES_TO_TEST; t++)
                 {
-                    char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+                    char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
                     char iotype_name[PIO_MAX_NAME + 1];
                     int ncid;
                     int dimid;
@@ -653,7 +654,7 @@ int test_fill_mode(int iosysid, int num_flavors, int *flavor, int my_rank,
                     /* Create a filename. */
                     if ((ret = get_iotype_name(flavor[fmt], iotype_name)))
                         ERR(ret);
-                    snprintf(filename, PIO_MAX_NAME, "%s_fill_mode_async_%d_default_fill_%d_extra_var_%d_%s.nc",
+                    snprintf(filename, PIO_MAX_NAME * 2, "%s_fill_mode_async_%d_default_fill_%d_extra_var_%d_%s.nc",
                              TEST_NAME, async, default_fill, extra_var, iotype_name);
 
                     /* Create the test file. */
diff --git a/tests/cunit/test_pioc_putget.c b/tests/cunit/test_pioc_putget.c
index 78e55f2e9d6..ce2732718f7 100644
--- a/tests/cunit/test_pioc_putget.c
+++ b/tests/cunit/test_pioc_putget.c
@@ -321,7 +321,7 @@ int test_atts_byte(int iosysid, int num_flavors, int *flavor, int my_rank,
     for (int fmt = 0; fmt < num_flavors; fmt++)
     {
         char iotype_name[PIO_MAX_NAME + 1];
-        char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+        char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
         int ncid;
         int ret;    /* Return code. */
 
@@ -433,7 +433,7 @@ int test_atts_int64(int iosysid, int num_flavors, int *flavor, int my_rank,
     for (int fmt = 0; fmt < num_flavors; fmt++)
     {
         char iotype_name[PIO_MAX_NAME + 1];
-        char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+        char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
         int ncid;
         int ret;    /* Return code. */
 
@@ -1917,7 +1917,7 @@ int test_putget(int iosysid, int num_flavors, int *flavor, int my_rank,
              * available ways. */
             for (int fmt = 0; fmt < num_flavors; fmt++)
             {
-                char filename[PIO_MAX_NAME + 1]; /* Test filename. */
+                char filename[PIO_MAX_NAME * 2 + 1]; /* Test filename. */
                 char iotype_name[PIO_MAX_NAME + 1];
                 int ncid;
                 int varid[NUM_NETCDF4_TYPES + 1];
@@ -1926,7 +1926,7 @@ int test_putget(int iosysid, int num_flavors, int *flavor, int my_rank,
                 /* Create a filename. */
                 if ((ret = get_iotype_name(flavor[fmt], iotype_name)))
                     return ret;
-                snprintf(filename, PIO_MAX_NAME, "%s_putget_access_%d_unlim_%d_%s.nc", TEST_NAME,
+                snprintf(filename, PIO_MAX_NAME * 2, "%s_putget_access_%d_unlim_%d_%s.nc", TEST_NAME,
                          access, unlim, iotype_name);
 
                 /* Create test file with dims and vars defined. */
diff --git a/tests/general/ncdf_simple_tests.F90.in b/tests/general/ncdf_simple_tests.F90.in
index 2af0e21c651..272997d0a1c 100644
--- a/tests/general/ncdf_simple_tests.F90.in
+++ b/tests/general/ncdf_simple_tests.F90.in
@@ -11,7 +11,7 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_clobber
   type(file_desc_t) :: pio_file
   character(len=PIO_TF_MAX_STR_LEN), parameter :: clob_fname = "pio_test_clobber.nc"
   integer :: ret
-  
+
   ! Default is NOCLOBBER
   ret = PIO_createfile(pio_tf_iosystem_, pio_file, tgv_iotype, clob_fname)
   PIO_TF_CHECK_ERR(ret, "Failed to create:" // trim(clob_fname))
@@ -32,7 +32,7 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_redef_enddef
   Implicit none
   type(file_desc_t) :: pio_file
   integer :: ret
-  
+
   ret = PIO_openfile(pio_tf_iosystem_, pio_file, tgv_iotype, tgv_fname, PIO_write)
   PIO_TF_CHECK_ERR(ret, "Failed to open:" // trim(tgv_fname))
 
@@ -53,7 +53,7 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_def_dim
   type(file_desc_t) :: pio_file
   integer :: pio_dim
   integer :: ret
-  
+
   ret = PIO_openfile(pio_tf_iosystem_, pio_file, tgv_iotype, tgv_fname, PIO_write)
   PIO_TF_CHECK_ERR(ret, "Failed to open:" // trim(tgv_fname))
 
@@ -78,7 +78,7 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_def_var
   type(var_desc_t)  :: pio_var
   integer :: pio_dim
   integer :: ret
-  
+
   ret = PIO_openfile(pio_tf_iosystem_, pio_file, tgv_iotype, tgv_fname, PIO_write)
   PIO_TF_CHECK_ERR(ret, "Failed to open:" // trim(tgv_fname))
 
@@ -127,10 +127,10 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_data_conversion
   ! Set the decomposition for writing data as PIO_int
   call PIO_initdecomp(pio_tf_iosystem_, PIO_int, dims, compdof, wiodesc)
 
-  ! Set the decomposition for reading data as various types 
+  ! Set the decomposition for reading data as various types
   call PIO_initdecomp(pio_tf_iosystem_, PIO_TF_DATA_TYPE, dims, compdof, riodesc)
 
-  ierr = PIO_createfile(pio_tf_iosystem_, pio_file, tgv_iotype, data_fname, PIO_CLOBBER) 
+  ierr = PIO_createfile(pio_tf_iosystem_, pio_file, tgv_iotype, data_fname, PIO_CLOBBER)
   PIO_TF_CHECK_ERR(ierr, "Could not create file " // trim(data_fname))
 
   ierr = PIO_def_dim(pio_file, 'PIO_TF_test_dim', dims(1), pio_dim)
@@ -176,7 +176,7 @@ PIO_TF_TEST_DRIVER_BEGIN
   integer :: num_iotypes
 
   num_iotypes = 0
-  call PIO_TF_Get_nc_iotypes(iotypes, iotype_descs, num_iotypes) 
+  call PIO_TF_Get_nc_iotypes(iotypes, iotype_descs, num_iotypes)
   do i=1,num_iotypes
     tgv_iotype = iotypes(i)
     ret = PIO_createfile(pio_tf_iosystem_, pio_file, tgv_iotype, tgv_fname)
diff --git a/tests/general/util/pio_tf_f90gen.pl b/tests/general/util/pio_tf_f90gen.pl
index 7cf2672cda5..8c493f717b1 100755
--- a/tests/general/util/pio_tf_f90gen.pl
+++ b/tests/general/util/pio_tf_f90gen.pl
@@ -55,6 +55,8 @@ sub init_predef_types
   $template_predef_typename_types{"PIO_TF_FC_DATA_TYPE"} = [];
   push(@{$template_predef_typename_types{"PIO_TF_DATA_TYPE"}}, "PIO_int");
   push(@{$template_predef_typename_types{"PIO_TF_FC_DATA_TYPE"}}, "integer");
+  push(@{$template_predef_typename_types{"PIO_TF_DATA_TYPE"}}, "PIO_short");
+  push(@{$template_predef_typename_types{"PIO_TF_FC_DATA_TYPE"}}, "integer(kind=fc_short)");
   push(@{$template_predef_typename_types{"PIO_TF_DATA_TYPE"}}, "PIO_real");
   push(@{$template_predef_typename_types{"PIO_TF_FC_DATA_TYPE"}}, "real(kind=fc_real)");
   push(@{$template_predef_typename_types{"PIO_TF_DATA_TYPE"}}, "PIO_double");
@@ -563,7 +565,7 @@ sub parse_and_store_gen_templ_funcs
                         $ifline_num, \$is_transformed);
   }
   if($annotate_source){
-      if($out_line =~ /[^#]/){      
+      if($out_line =~ /[^#]/){
 	  $out_line .= "\n";
       }else{
 	  $out_line = $out_line . "   ! $base_file_name:$ifline_num" . "\n";
diff --git a/tests/general/util/pio_tutil.F90 b/tests/general/util/pio_tutil.F90
index 3e1a66da4a1..181c897f88d 100644
--- a/tests/general/util/pio_tutil.F90
+++ b/tests/general/util/pio_tutil.F90
@@ -33,6 +33,9 @@ MODULE pio_tutil
   INTEGER, PARAMETER, PUBLIC :: fc_real   = selected_real_kind(6)
   INTEGER, PARAMETER, PUBLIC :: fc_double = selected_real_kind(13)
 
+  ! integer types
+  INTEGER, PARAMETER, PUBLIC :: fc_short   = selected_int_kind(4)
+
   ! Misc constants
   INTEGER, PARAMETER :: PIO_TF_MAX_STR_LEN=100
 
@@ -93,6 +96,11 @@ MODULE pio_tutil
         PIO_TF_Check_int_arr_arr_tol, &
         PIO_TF_Check_2d_int_arr_arr,  &
         PIO_TF_Check_3d_int_arr_arr,  &
+        PIO_TF_Check_short_arr_val,     &
+        PIO_TF_Check_short_arr_arr,     &
+        PIO_TF_Check_short_arr_arr_tol, &
+        PIO_TF_Check_2d_short_arr_arr,  &
+        PIO_TF_Check_3d_short_arr_arr,  &
         PIO_TF_Check_real_arr_val,    &
         PIO_TF_Check_real_arr_arr,    &
         PIO_TF_Check_2d_real_arr_arr, &
@@ -707,6 +715,137 @@ LOGICAL FUNCTION PIO_TF_Check_3d_int_arr_arr(arr, exp_arr)
     DEALLOCATE(exp_arr_val)
   END FUNCTION
 
+
+  LOGICAL FUNCTION PIO_TF_Check_short_arr_arr_(arr, exp_arr, arr_shape)
+#ifndef NO_MPIMOD
+    USE mpi
+#else
+    include 'mpif.h'
+#endif
+    INTEGER(FC_SHORT), DIMENSION(:), INTENT(IN) :: arr
+    INTEGER(FC_SHORT), DIMENSION(:), INTENT(IN) :: exp_arr
+    INTEGER, DIMENSION(:), INTENT(IN) :: arr_shape
+    CHARACTER(LEN=PIO_TF_MAX_STR_LEN) :: idx_str
+    INTEGER :: arr_sz, i, ierr
+    ! Not equal at id = nequal_idx
+    INTEGER :: nequal_idx
+    ! Local and global equal bools
+    LOGICAL :: lequal, gequal
+    TYPE failed_info
+      SEQUENCE
+      INTEGER :: idx
+      INTEGER :: val
+      INTEGER :: exp_val
+    END TYPE failed_info
+    TYPE (failed_info) :: lfail_info
+    TYPE (failed_info), DIMENSION(:), ALLOCATABLE :: gfail_info
+
+    arr_sz = SIZE(arr)
+    lequal = .TRUE.;
+    gequal = .TRUE.;
+    nequal_idx = -1;
+    IF (arr_sz /= SIZE(exp_arr)) THEN
+      PRINT *, "PIO_TF: Unable to compare arrays of different sizes", arr_sz, " and", SIZE(exp_arr)
+    END IF
+    DO i=1, arr_sz
+      IF (arr(i) /= exp_arr(i)) THEN
+        lequal = .FALSE.
+        nequal_idx = i
+      END IF
+    END DO
+    CALL MPI_ALLREDUCE(lequal, gequal, 1, MPI_LOGICAL, MPI_LAND, pio_tf_comm_, ierr)
+    IF (.NOT. gequal) THEN
+      lfail_info % idx = nequal_idx
+      IF (nequal_idx /= -1) THEN
+        lfail_info % val     = arr(nequal_idx)
+        lfail_info % exp_val = exp_arr(nequal_idx)
+      END IF
+      ALLOCATE(gfail_info(pio_tf_world_sz_))
+      ! Gather the ranks where assertion failed
+      CALL MPI_GATHER(lfail_info, 3, MPI_INTEGER, gfail_info, 3, MPI_INTEGER, 0, pio_tf_comm_, ierr)
+      IF (pio_tf_world_rank_ == 0) THEN
+         DO i=1,pio_tf_world_sz_
+            IF(gfail_info(i) % idx /= -1) THEN
+               CALL PIO_TF_Get_idx_from_1d_idx(gfail_info(i) % idx, arr_shape, idx_str)
+               PRINT *, "PIO_TF: Fatal Error: rank =", i, ", Val[",&
+                    trim(idx_str), "]=",&
+                    gfail_info(i) % val, ", Expected = ", gfail_info(i) % exp_val
+            END IF
+         END DO
+      END IF
+      deallocate(gfail_info)
+   end if
+    PIO_TF_Check_short_arr_arr_ = gequal
+  END FUNCTION PIO_TF_Check_short_arr_arr_
+
+  LOGICAL FUNCTION PIO_TF_Check_short_arr_arr(arr, exp_arr)
+    INTEGER(FC_SHORT), DIMENSION(:), INTENT(IN) :: arr
+    INTEGER(FC_SHORT), DIMENSION(:), INTENT(IN) :: exp_arr
+
+    PIO_TF_Check_short_arr_arr = PIO_TF_Check_short_arr_arr_(arr, exp_arr, SHAPE(arr))
+  END FUNCTION PIO_TF_Check_short_arr_arr
+
+  ! Note that the tolerance value is ignored when comparing two integer arrays
+  ! We have this interface to make it easier to generate common code for
+  ! comparing ints, reals and doubles
+  LOGICAL FUNCTION PIO_TF_Check_short_arr_arr_tol(arr, exp_arr, tol)
+    INTEGER(FC_SHORT), DIMENSION(:), INTENT(IN) :: arr
+    INTEGER(FC_SHORT), DIMENSION(:), INTENT(IN) :: exp_arr
+    REAL, INTENT(IN) :: tol
+    if (tol /= 0) continue ! to suppress warning
+
+    PIO_TF_Check_short_arr_arr_tol = PIO_TF_Check_short_arr_arr(arr, exp_arr)
+  END FUNCTION PIO_TF_Check_short_arr_arr_tol
+
+  LOGICAL FUNCTION PIO_TF_Check_short_arr_val(arr, val)
+    INTEGER(FC_SHORT), DIMENSION(:), INTENT(IN) :: arr
+    INTEGER(FC_SHORT), INTENT(IN) :: val
+    INTEGER(fc_short), DIMENSION(:), ALLOCATABLE :: arr_val
+
+    ALLOCATE(arr_val(SIZE(arr)))
+    arr_val = val
+    PIO_TF_Check_short_arr_val = PIO_TF_Check_short_arr_arr(arr, arr_val)
+    DEALLOCATE(arr_val)
+  END FUNCTION PIO_TF_Check_short_arr_val
+
+  LOGICAL FUNCTION PIO_TF_Check_2d_short_arr_arr(arr, exp_arr)
+    INTEGER(FC_SHORT), DIMENSION(:,:), INTENT(IN) :: arr
+    INTEGER(FC_SHORT), DIMENSION(:,:), INTENT(IN) :: exp_arr
+
+    INTEGER(FC_SHORT), DIMENSION(:), ALLOCATABLE :: arr_val
+    INTEGER(FC_SHORT), DIMENSION(:), ALLOCATABLE :: exp_arr_val
+    INTEGER, PARAMETER :: NDIMS = 2
+
+    ALLOCATE(arr_val(SIZE(arr)))
+    ALLOCATE(exp_arr_val(SIZE(exp_arr)))
+    arr_val = RESHAPE(arr,(/SIZE(arr)/))
+    exp_arr_val = RESHAPE(exp_arr,(/SIZE(exp_arr)/))
+
+    PIO_TF_Check_2d_short_arr_arr = PIO_TF_Check_short_arr_arr_(arr_val, exp_arr_val,&
+                                    SHAPE(arr))
+    DEALLOCATE(arr_val)
+    DEALLOCATE(exp_arr_val)
+  END FUNCTION PIO_TF_Check_2d_short_arr_arr
+
+  LOGICAL FUNCTION PIO_TF_Check_3d_short_arr_arr(arr, exp_arr)
+    INTEGER(FC_SHORT), DIMENSION(:,:,:), INTENT(IN) :: arr
+    INTEGER(FC_SHORT), DIMENSION(:,:,:), INTENT(IN) :: exp_arr
+
+    INTEGER(FC_SHORT), DIMENSION(:), ALLOCATABLE :: arr_val
+    INTEGER(FC_SHORT), DIMENSION(:), ALLOCATABLE :: exp_arr_val
+    INTEGER, PARAMETER :: NDIMS = 2
+
+    ALLOCATE(arr_val(SIZE(arr)))
+    ALLOCATE(exp_arr_val(SIZE(exp_arr)))
+    arr_val = RESHAPE(arr,(/SIZE(arr)/))
+    exp_arr_val = RESHAPE(exp_arr,(/SIZE(exp_arr)/))
+
+    PIO_TF_Check_3d_short_arr_arr = PIO_TF_Check_short_arr_arr_(arr_val, exp_arr_val,&
+                                    SHAPE(arr))
+    DEALLOCATE(arr_val)
+    DEALLOCATE(exp_arr_val)
+  END FUNCTION PIO_TF_Check_3d_short_arr_arr
+
   LOGICAL FUNCTION PIO_TF_Check_real_arr_arr_tol_(arr, exp_arr, arr_shape, tol)
 #ifndef NO_MPIMOD
     USE mpi
diff --git a/tests/unit/ncdf_tests.F90 b/tests/unit/ncdf_tests.F90
index d426b3192f9..66f529a729b 100644
--- a/tests/unit/ncdf_tests.F90
+++ b/tests/unit/ncdf_tests.F90
@@ -460,8 +460,16 @@ Subroutine test_nc4(test_id, err_msg)
     print*, 'testing PIO_def_var_deflate' 
     shuffle = 0
     deflate = 1
-    deflate_level = 2
-    deflate_level_2 = 4
+
+    ! NetCDF-4.7.4 lost ability to set deflate once it was already
+    ! set. THis is going to be fixed in the next release of
+    ! netCDF. Until then I will change all deflate levels to 1 and the
+    ! test will pass.
+    ! deflate_level = 2
+    ! deflate_level_2 = 4
+    deflate_level = 1
+    deflate_level_2 = 1
+    ret_val = PIO_set_log_level(3)
     ret_val = PIO_def_var_deflate(pio_file, pio_var, shuffle, deflate, &
          deflate_level)
 
@@ -513,6 +521,7 @@ Subroutine test_nc4(test_id, err_msg)
           call PIO_closefile(pio_file)
           return
        else
+          print *,shuffle, deflate, deflate_level, my_deflate_level
           if (shuffle .ne. 0 .or. deflate .ne. 1 .or. my_deflate_level .ne. deflate_level) then
              err_msg = "Wrong values for deflate and shuffle for serial netcdf-4 file"
              call PIO_closefile(pio_file)