diff --git a/examples/c/run_tests.sh b/examples/c/run_tests.sh
index c4eb19bb6ad..1cfb586d292 100755
--- a/examples/c/run_tests.sh
+++ b/examples/c/run_tests.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # This is a test script for PIO examples.
 # Ed Hartnett 5/7/18
 
@@ -5,7 +6,7 @@
 set -e
 
 # Stop loop if ctrl-c is pressed.
-trap exit SIGINT SIGTERM
+trap exit INT TERM
 
 printf 'running PIO examples...\n'
 
diff --git a/src/clib/pio_getput_int.c b/src/clib/pio_getput_int.c
index 01f2a4102a2..63541a679bf 100644
--- a/src/clib/pio_getput_int.c
+++ b/src/clib/pio_getput_int.c
@@ -866,8 +866,14 @@ int PIOc_get_var_tc(int ncid, int varid, nc_type xtype, void *buf)
 
         /* Find the dimension lengths. */
         for (int d = 0; d < ndims; d++)
+        {
             if ((ierr = PIOc_inq_dimlen(ncid, dimids[d], &countp[d])))
+            {
+                free(startp);
+                free(countp);
                 return pio_err(ios, file, ierr, __FILE__, __LINE__);
+            }
+        }
 
         /* Set up start array. */
         for (int d = 0; d < ndims; d++)
diff --git a/src/clib/pio_msg.c b/src/clib/pio_msg.c
index ec8003a8a47..38dd3f25fbc 100644
--- a/src/clib/pio_msg.c
+++ b/src/clib/pio_msg.c
@@ -1225,9 +1225,9 @@ int inq_var_deflate_handler(iosystem_desc_t *ios)
     char shuffle_present;
     char deflate_present;
     char deflate_level_present;
-    int shuffle, *shufflep;
-    int deflate, *deflatep;
-    int deflate_level, *deflate_levelp;
+    int shuffle, *shufflep = NULL;
+    int deflate, *deflatep = NULL;
+    int deflate_level, *deflate_levelp = NULL;
     int mpierr;
 
     assert(ios);
@@ -2331,9 +2331,9 @@ int get_chunk_cache_handler(iosystem_desc_t *ios)
     int iosysid;
     int iotype;
     char size_present, nelems_present, preemption_present;
-    PIO_Offset size, *sizep;
-    PIO_Offset nelems, *nelemsp;
-    float preemption, *preemptionp;
+    PIO_Offset size, *sizep = NULL;
+    PIO_Offset nelems, *nelemsp = NULL;
+    float preemption, *preemptionp = NULL;
     int mpierr = MPI_SUCCESS;  /* Return code from MPI function codes. */
 
     LOG((1, "get_chunk_cache_handler called"));
@@ -2384,9 +2384,9 @@ int get_var_chunk_cache_handler(iosystem_desc_t *ios)
     int ncid;
     int varid;
     char size_present, nelems_present, preemption_present;
-    PIO_Offset size, *sizep;
-    PIO_Offset nelems, *nelemsp;
-    float preemption, *preemptionp;
+    PIO_Offset size, *sizep = NULL;
+    PIO_Offset nelems, *nelemsp = NULL;
+    float preemption, *preemptionp = NULL;
     int mpierr = MPI_SUCCESS;  /* Return code from MPI function codes. */
 
     LOG((1, "get_var_chunk_cache_handler called"));
diff --git a/src/clib/pio_rearrange.c b/src/clib/pio_rearrange.c
index 688b30c85eb..8aa1c596cb7 100644
--- a/src/clib/pio_rearrange.c
+++ b/src/clib/pio_rearrange.c
@@ -2076,7 +2076,6 @@ void performance_tune_rearranger(iosystem_desc_t *ios, io_desc_t *iodesc)
     if (!(wall = bget(2 * 4 * log2 * sizeof(double))))
         return pio_err(ios, file, PIO_ENOMEM, __FILE__, __LINE__);
     double mintime;
-    int k = 0;
 
     if ((mpierr = MPI_Barrier(mycomm)))
         return check_mpi(NULL, mpierr, __FILE__, __LINE__);
diff --git a/tests/cunit/run_tests.sh b/tests/cunit/run_tests.sh
index 5261b41aee5..105bfd1b90c 100755
--- a/tests/cunit/run_tests.sh
+++ b/tests/cunit/run_tests.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # This is a test script for PIO.
 # Ed Hartnett
 
@@ -5,7 +6,7 @@
 set -e
 
 # Stop loop if ctrl-c is pressed.
-trap exit SIGINT SIGTERM
+trap exit INT TERM
 
 printf 'running PIO tests...\n'
 
diff --git a/tests/general/test_memleak.c b/tests/general/test_memleak.c
index 3c81f477df1..f9ecbd720df 100644
--- a/tests/general/test_memleak.c
+++ b/tests/general/test_memleak.c
@@ -122,9 +122,6 @@ main(int argc, char **argv)
      * example. */
     int ioproc_stride = 1;
 
-    /** Number of the aggregator? Always 0 in this example. */
-    int numAggregator = 0;
-
     /** Zero based rank of first processor to be used for I/O. */
     int ioproc_start = 0;