Index: aclocal.m4
===================================================================
--- aclocal.m4	(revision 2088)
+++ aclocal.m4	(working copy)
@@ -818,7 +818,6 @@
            integer status, sub
            data values /-1, -2, -3, -4/
            status = sub(values)
-           call exit(status)
            end
 EOF
     ac_cv_ctype_fortran=no
@@ -1244,7 +1243,7 @@
 # Flag ordering is significant: put flags late which some compilers use
 # for the search path.
 for ac_flag in -J '-J ' -fmod= -moddir= +moddir= -qmoddir= '-mod ' \
-	      '-module ' -M '-Am -M' '-e m -J '; do
+	      '-mdir '  '-module ' -M '-Am -M' '-e m -J '; do
   FCFLAGS="$ac_fc_module_output_flag_FCFLAGS_save ${ac_flag}sub"
   AC_COMPILE_IFELSE([[
       module conftest_module
Index: src/libf90/nf90_constants.f90
===================================================================
--- src/libf90/nf90_constants.f90	(revision 2088)
+++ src/libf90/nf90_constants.f90	(working copy)
@@ -54,8 +54,8 @@
     nf90_fill_real8  = nf90_fill_double,              &
     nf90_fill_uint64 = 1.8446744073709551614e+19
   integer (kind = EightByteInt), parameter, public :: &
-    nf90_fill_uint   = 4294967295_8,                  &
-    nf90_fill_int64  = -9223372036854775806_8
+    nf90_fill_uint   = 4294967295_EightByteInt,                  &
+    nf90_fill_int64  = -9223372036854775806_EightByteInt
 
   !
   ! mode flags for opening and creating a netcdf dataset:
@@ -251,9 +251,9 @@
       NF90_EQUOTA                   = NF_EQUOTA                   , & ! Quota exceeded
       NF90_ENULLSTART               = NF_ENULLSTART               , & ! argument start is a NULL pointer
       NF90_ENULLCOUNT               = NF_ENULLCOUNT               , & ! argument count is a NULL pointer
-      NF90_EINVAL_CMODE             = NF_EINVAL_CMODE             , & ! Invalid file create mode, cannot have both NC_64BIT_OFFSET & NC_64BIT_DATA
-      NF90_ETYPESIZE                = NF_ETYPESIZE                , & ! MPI derived data type size error (bigger than the variable size)
-      NF90_ETYPE_MISMATCH           = NF_ETYPE_MISMATCH           , & ! element type of the MPI derived data type mismatches the variable type
+      NF90_EINVAL_CMODE       = NF_EINVAL_CMODE, & ! Invalid file create mode, cannot have both NC_64BIT_OFFSET & NC_64BIT_DATA
+      NF90_ETYPESIZE                = NF_ETYPESIZE         , & ! MPI derived data type size error (bigger than the variable size)
+      NF90_ETYPE_MISMATCH   = NF_ETYPE_MISMATCH  , & ! element type of the MPI derived data type mismatches the variable type
       NF90_ETYPESIZE_MISMATCH       = NF_ETYPESIZE_MISMATCH       , & ! file type size mismatches buffer type size
       NF90_ESTRICTCDF2              = NF_ESTRICTCDF2              , & ! Attempting CDF-5 operation on CDF-2 file
       NF90_ENOTRECVAR               = NF_ENOTRECVAR               , & ! Attempting operation only for record variables
Index: src/libf90/nfmpi_constants.f90.in
===================================================================
--- src/libf90/nfmpi_constants.f90.in	(revision 2088)
+++ src/libf90/nfmpi_constants.f90.in	(working copy)
@@ -59,9 +59,9 @@
       nf_fill_double = 9.9692099683868690e+36, &
       nf_fill_uint64 = 1.8446744073709551614e+19
 
-      integer (KIND=8), parameter, public :: &
-      nf_fill_uint  = 4294967295_8, &
-      nf_fill_int64 = -9223372036854775806_8
+      integer (KIND=EightByteInt), parameter, public :: &
+      nf_fill_uint  = 4294967295_EightByteInt, &
+      nf_fill_int64 = -9223372036854775806_EightByteInt
 
 !
 ! mode flags for opening and creating a netcdf dataset:
Index: test/fandc/pnf_test.f
===================================================================
--- test/fandc/pnf_test.f	(revision 2088)
+++ test/fandc/pnf_test.f	(working copy)
@@ -48,7 +48,7 @@
       ! number of read samples
       ! number of write samples
 
-      INTEGER(KIND=MPI_OFFSET_KIND) TOTSIZ_3D(3) ! global sizes of 3D field
+      INTEGER(KIND=MPI_OFFSET_KIND) :: TOTSIZ_3D(3) ! global sizes of 3D field
 
 
 !     ----------------------
@@ -61,12 +61,12 @@
               
       integer comm_cart                   ! Cartesian communicator
       integer ierr
-      INTEGER(KIND=MPI_OFFSET_KIND) istart, jstart, kstart      ! offsets of 3D field
-      INTEGER(KIND=MPI_OFFSET_KIND) locsiz
+      INTEGER(KIND=MPI_OFFSET_KIND) :: istart, jstart, kstart      ! offsets of 3D field
+      INTEGER(KIND=MPI_OFFSET_KIND) :: locsiz
       integer mype                        ! rank in comm_cart
       integer totpes                      ! total number of PEs
               
-      INTEGER(KIND=MPI_OFFSET_KIND) locsiz_3d(3)                ! local sizes of 3D fields
+      INTEGER(KIND=MPI_OFFSET_KIND) :: locsiz_3d(3)                ! local sizes of 3D fields
       integer pe_coords(3)                ! Cartesian PE coords
               
       integer numpes(3)                      ! number of PEs along axes;