diff --git a/Source/Fortran/distributed_algebra_includes/MatrixMultiply.f90 b/Source/Fortran/distributed_algebra_includes/MatrixMultiply.f90
index b7f77a7d..38025f29 100644
--- a/Source/Fortran/distributed_algebra_includes/MatrixMultiply.f90
+++ b/Source/Fortran/distributed_algebra_includes/MatrixMultiply.f90
@@ -96,7 +96,7 @@
            !$OMP TASK DEFAULT(SHARED), PRIVATE(JJ2, JJ2_range), FIRSTPRIVATE(II)
            !! First Align The Data We Are Working With
            JJ2_range = matAB%process_grid%number_of_blocks_columns / &
-                     & matAB%process_grid%num_process_slices
+                & matAB%process_grid%num_process_slices
            DO JJ2 = 1, JJ2_range
               CALL CopyMatrix(matA%LMAT(II, &
                    & duplicate_start_column + &
@@ -156,7 +156,7 @@
            !$OMP TASK DEFAULT(SHARED), PRIVATE(II2, II2_range), FIRSTPRIVATE(JJ)
            !! First Transpose The Data We Are Working With
            II2_range = matAB%process_grid%number_of_blocks_rows / &
-                     & matAB%process_grid%num_process_slices
+                & matAB%process_grid%num_process_slices
            DO II2 = 1, II2_range
               CALL TransposeMatrix(matB%LMAT(duplicate_start_row + &
                    & duplicate_offset_row * (II2 - 1), JJ), &
diff --git a/Source/Fortran/distributed_includes/TransposeMatrix.f90 b/Source/Fortran/distributed_includes/TransposeMatrix.f90
index 946e2c8c..a7e4cc74 100644
--- a/Source/Fortran/distributed_includes/TransposeMatrix.f90
+++ b/Source/Fortran/distributed_includes/TransposeMatrix.f90
@@ -22,9 +22,9 @@
           & AMat%process_grid%my_slice) THEN
         KK = KK + 1
         CALL GetTripletAt(tlist, II, trip)
-        new_list%data(KK)%index_row = trip%index_column
-        new_list%data(KK)%index_column = trip%index_row
-        new_list%data(KK)%point_value = trip%point_value
+        new_list%DATA(KK)%index_row = trip%index_column
+        new_list%DATA(KK)%index_column = trip%index_row
+        new_list%DATA(KK)%point_value = trip%point_value
      END IF
   END DO
   CALL DestructTripletList(tlist)
@@ -33,4 +33,4 @@
   CALL DestructMatrix(TransMat)
   CALL ConstructEmptyMatrix(TransMat, AMat)
   CALL FillMatrixFromTripletList(TransMat, new_list)
-  CALL DestructTripletList(new_list)
\ No newline at end of file
+  CALL DestructTripletList(new_list)
diff --git a/Source/Fortran/eigenexa_includes/EigenToNT.f90 b/Source/Fortran/eigenexa_includes/EigenToNT.f90
index c1008660..73b85e30 100644
--- a/Source/Fortran/eigenexa_includes/EigenToNT.f90
+++ b/Source/Fortran/eigenexa_includes/EigenToNT.f90
@@ -21,7 +21,7 @@
   DO JJ = col_start, col_end
      DO II = row_start, row_end
         IF (ABS(VD1(ind + II -1)) .GT. params%threshold) THEN
-          KK = KK + 1
+           KK = KK + 1
         END IF
      END DO
      ind = ind + exa%offset
@@ -39,7 +39,7 @@
         IF (ABS(VD1(ind + II -1)) .GT. params%threshold) THEN
            KK = KK + 1
            ilookup = eigen_translate_l2g(II, exa%proc_rows, exa%rowid)
-           CALL SetTriplet(triplet_v%data(KK), jlookup, ilookup, &
+           CALL SetTriplet(triplet_v%DATA(KK), jlookup, ilookup, &
                 & VD1(ind + II -1))
         END IF
      END DO