diff --git a/openacc/impl/psb_d_oacc_ell_cp_from_coo.F90 b/openacc/impl/psb_d_oacc_ell_cp_from_coo.F90
index 560d3451..4e8402e7 100644
--- a/openacc/impl/psb_d_oacc_ell_cp_from_coo.F90
+++ b/openacc/impl/psb_d_oacc_ell_cp_from_coo.F90
@@ -47,7 +47,7 @@ contains
         row_counts(row) = row_counts(row) + 1
       else
         info = psb_err_invalid_mat_state_
-        goto 9999
+        !goto 9999
       end if
     end do
 
diff --git a/openacc/impl/psb_d_oacc_hll_cp_from_coo.F90 b/openacc/impl/psb_d_oacc_hll_cp_from_coo.F90
index fbe793d5..4a258c74 100644
--- a/openacc/impl/psb_d_oacc_hll_cp_from_coo.F90
+++ b/openacc/impl/psb_d_oacc_hll_cp_from_coo.F90
@@ -48,7 +48,7 @@ contains
         row_counts(row) = row_counts(row) + 1
       else
         info = psb_err_invalid_mat_state_
-        goto 9999
+        !goto 9999
       end if
     end do
 
diff --git a/openacc/impl/psb_d_oacc_hll_csmv.F90 b/openacc/impl/psb_d_oacc_hll_csmv.F90
index 504cad19..bccd3d6d 100644
--- a/openacc/impl/psb_d_oacc_hll_csmv.F90
+++ b/openacc/impl/psb_d_oacc_hll_csmv.F90
@@ -64,8 +64,11 @@ contains
       do i = 1, m
         y(i) = beta * y(i)
       end do
-
+#if (__GNUC__ <= 13) 
+      !$acc parallel loop present(a, x, y)
+#else      
       !$acc parallel loop collapse(2) present(a, x, y)
+#endif
       do i = 1, nhacks
         do j = a%hkoffs(i), a%hkoffs(i + 1) - 1
           y(a%irn(j)) = y(a%irn(j)) + alpha * a%val(j) * x(a%ja(j))
diff --git a/openacc/impl/psb_d_oacc_hll_scal.F90 b/openacc/impl/psb_d_oacc_hll_scal.F90
index 50210f4b..c0c284ef 100644
--- a/openacc/impl/psb_d_oacc_hll_scal.F90
+++ b/openacc/impl/psb_d_oacc_hll_scal.F90
@@ -23,7 +23,8 @@ contains
 
     if (present(side)) then
       if (side == 'L') then
-        !$acc parallel loop collapse(2) present(a, d)
+        ! $ a    parallel loop collapse(2) present(a, d)
+        !$acc parallel loop  present(a, d)
         do i = 1, nhacks
           do j = a%hkoffs(i), a%hkoffs(i + 1) - 1
             k = (j - a%hkoffs(i)) / nzt + (i - 1) * hksz + 1
@@ -31,7 +32,8 @@ contains
           end do
         end do
       else if (side == 'R') then
-        !$acc parallel loop collapse(2) present(a, d)
+        ! $ a  parallel loop collapse(2) present(a, d)
+        !$acc parallel loop present(a, d)
         do i = 1, nhacks
           do j = a%hkoffs(i), a%hkoffs(i + 1) - 1
             a%val(j) = a%val(j) * d(a%ja(j))
@@ -39,7 +41,8 @@ contains
         end do
       end if
     else
-      !$acc parallel loop collapse(2) present(a, d)
+      ! $ a parallel loop collapse(2) present(a, d)
+      !$acc parallel loop  present(a, d)
       do i = 1, nhacks
         do j = a%hkoffs(i), a%hkoffs(i + 1) - 1
           a%val(j) = a%val(j) * d(j - a%hkoffs(i) + 1)
diff --git a/openacc/impl/psb_d_oacc_hll_scals.F90 b/openacc/impl/psb_d_oacc_hll_scals.F90
index ccb6b1b8..1e3457b5 100644
--- a/openacc/impl/psb_d_oacc_hll_scals.F90
+++ b/openacc/impl/psb_d_oacc_hll_scals.F90
@@ -20,7 +20,8 @@ contains
     nhacks = (a%get_nrows() + hksz - 1) / hksz
     nzt = a%nzt
 
-    !$acc parallel loop collapse(2) present(a)
+    ! $ a parallel loop collapse(2) present(a)
+    !$acc parallel loop  present(a)
     do i = 1, nhacks
       do j = a%hkoffs(i), a%hkoffs(i + 1) - 1
         a%val(j) = a%val(j) * d