diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml
index de2a5e951d..fc46a09b59 100644
--- a/.github/workflows/main-cmake.yml
+++ b/.github/workflows/main-cmake.yml
@@ -1,6 +1,6 @@
 name: NetCDF-C CMake CI - Windows
 
-on: [push, pull_request, workflow_dispatch]
+on: [ pull_request, workflow_dispatch]
 
 env:
   REMOTETESTDOWN: no
diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index b3aa5c830d..c27cf8666e 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -4,7 +4,7 @@
 
 name: Run Ubuntu/Linux netCDF Tests
 
-on: [push,pull_request,workflow_dispatch]
+on: [pull_request,workflow_dispatch]
 
 env:
   REMOTETESTDOWN: no
diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml
index 15c5373e4c..8a80afbc73 100644
--- a/.github/workflows/run_tests_win_cygwin.yml
+++ b/.github/workflows/run_tests_win_cygwin.yml
@@ -1,6 +1,6 @@
 name: Run Cygwin-based tests
 
-on: [push,pull_request,workflow_dispatch]
+on: [pull_request,workflow_dispatch]
 
 concurrency:
   group: ${{ github.workflow}}-${{ github.head_ref }}
diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml
index 199b49d2c8..018863973b 100644
--- a/.github/workflows/run_tests_win_mingw.yml
+++ b/.github/workflows/run_tests_win_mingw.yml
@@ -10,7 +10,7 @@ env:
   CPPFLAGS: "-D_BSD_SOURCE"
   REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}
 
-on: [push,pull_request,workflow_dispatch]
+on: [pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  
diff --git a/oc2/ocinternal.c b/oc2/ocinternal.c
index 827b3ffcb3..4ef941cc07 100644
--- a/oc2/ocinternal.c
+++ b/oc2/ocinternal.c
@@ -338,7 +338,7 @@ createtempfile(OCstate* state, OCtree* tree)
     strncpy(path,globalstate->tempdir,len);
     strlcat(path,"/",len);
     strlcat(path,DATADDSFILE,len);
-    tmppath = NC_mktmp(path);
+    if((stat = NC_mktmp(path,&tmppath))) goto done;
     free(path);
     if(tmppath == NULL) {stat = OC_EACCESS; goto fail;}
 #ifdef OCDEBUG