diff --git a/configure.ac b/configure.ac
index 38df570..835f3f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,7 @@ AC_PROG_F77
 m4_version_prereq([2.70],[], [AC_PROG_CC_C99])
 AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([The compiler does not support C99])])
 AC_PROG_CC_C_O
+AM_PROG_CC_C_O
 AC_PROG_FC
 AC_PROG_FC_C_O
 AC_FC_PP_DEFINE
@@ -255,7 +256,7 @@ AS_IF([test "$HAVE_OPENACC_OFFLOAD" = "yes"], [
           CFLAGS="$CFLAGS -fopenacc"
           ;;
     *nvc*)
-          CFLAGS="$CFLAGS -acc -mp -target=gpu"
+          CFLAGS="$CFLAGS -acc"
           ;;
   esac
 
@@ -265,7 +266,7 @@ AS_IF([test "$HAVE_OPENACC_OFFLOAD" = "yes"], [
           FCFLAGS="$FCFLAGS -fopenacc"
           ;;
     *nvfortran*)
-          FCFLAGS="$FCFLAGS -acc -mp -target=gpu"
+          FCFLAGS="$FCFLAGS -acc"
           ;;
   esac
 
@@ -281,7 +282,7 @@ AS_IF([test "$HAVE_CUBLAS_OFFLOAD" = "yes"], [
           CFLAGS="$CFLAGS -fopenacc"
           ;;
     *nvc*)
-          CFLAGS="$CFLAGS -acc -mp -target=gpu"
+          CFLAGS="$CFLAGS -acc"
           ;;
   esac
 
@@ -291,7 +292,7 @@ AS_IF([test "$HAVE_CUBLAS_OFFLOAD" = "yes"], [
           FCFLAGS="$FCFLAGS -fopenacc"
           ;;
     *nvfortran*)
-          FCFLAGS="$FCFLAGS -acc -mp -target=gpu"
+          FCFLAGS="$FCFLAGS -acc"
           ;;
   esac
 ])
diff --git a/org/qmckl_jastrow.org b/org/qmckl_jastrow.org
index c602d84..017e372 100644
--- a/org/qmckl_jastrow.org
+++ b/org/qmckl_jastrow.org
@@ -737,7 +737,7 @@ qmckl_exit_code qmckl_get_jastrow_offload_type (const qmckl_context context, qmc
                            "offload_type is a null pointer");
   }
 
-  qmckl_context_struct* const ctx = (qmckl_context_struct* const) context;
+  qmckl_context_struct* const ctx = (qmckl_context_struct*) context;
   assert (ctx != NULL);
 
   int32_t mask = 1 << 0;