diff --git a/code/DAMASK_abaqus_exp.f b/code/DAMASK_abaqus_exp.f
index 575a3308e..436035a2c 100644
--- a/code/DAMASK_abaqus_exp.f
+++ b/code/DAMASK_abaqus_exp.f
@@ -82,6 +82,13 @@ end module DAMASK_interface
 #include "mesh.f90"
 #include "material.f90"
 #include "lattice.f90"
+#include "damage_none.f90"
+#include "damage_gradient.f90"
+#include "constitutive_damage.f90"
+#include "thermal_none.f90"
+#include "thermal_conduction.f90"
+#include "thermal_adiabatic.f90"
+#include "constitutive_thermal.f90"
 #include "constitutive_none.f90"
 #include "constitutive_j2.f90"
 #include "constitutive_phenopowerlaw.f90"
@@ -95,13 +102,6 @@ end module DAMASK_interface
 #include "homogenization_RGC.f90"
 #include "homogenization.f90"
 #include "CPFEM.f90"
-#include "constitutive_damage.f90"
-#include "damage_none.f90"
-#include "damage_gradient.f90"
-#include "constitutive_thermal.f90"
-#include "thermal_none.f90"
-#include "thermal_conduction.f90"
-#include "thermal_adiabatic.f90"
 
 subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, &
                  stepTime, totalTime, dt, cmName, coordMp, charLength, &
diff --git a/code/DAMASK_abaqus_std.f b/code/DAMASK_abaqus_std.f
index 08dda9088..212a79a99 100644
--- a/code/DAMASK_abaqus_std.f
+++ b/code/DAMASK_abaqus_std.f
@@ -82,6 +82,13 @@ end module DAMASK_interface
 #include "mesh.f90"
 #include "material.f90"
 #include "lattice.f90"
+#include "damage_none.f90"
+#include "damage_gradient.f90"
+#include "constitutive_damage.f90"
+#include "thermal_none.f90"
+#include "thermal_conduction.f90"
+#include "thermal_adiabatic.f90"
+#include "constitutive_thermal.f90"
 #include "constitutive_none.f90"
 #include "constitutive_j2.f90"
 #include "constitutive_phenopowerlaw.f90"
@@ -95,13 +102,7 @@ end module DAMASK_interface
 #include "homogenization_RGC.f90"
 #include "homogenization.f90"
 #include "CPFEM.f90"
-#include "constitutive_damage.f90"
-#include "damage_none.f90"
-#include "damage_gradient.f90"
-#include "constitutive_thermal.f90"
-#include "thermal_none.f90"
-#include "thermal_conduction.f90"
-#include "thermal_adiabatic.f90"
+
 
  
 subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,&
diff --git a/code/DAMASK_marc.f90 b/code/DAMASK_marc.f90
index 0b1f61e92..214eec3bf 100644
--- a/code/DAMASK_marc.f90
+++ b/code/DAMASK_marc.f90
@@ -111,6 +111,13 @@ end module DAMASK_interface
 #include "mesh.f90"
 #include "material.f90"
 #include "lattice.f90"
+#include "damage_none.f90"
+#include "damage_gradient.f90"
+#include "constitutive_damage.f90"
+#include "thermal_none.f90"
+#include "thermal_conduction.f90"
+#include "thermal_adiabatic.f90"
+#include "constitutive_thermal.f90"
 #include "constitutive_none.f90"
 #include "constitutive_j2.f90"
 #include "constitutive_phenopowerlaw.f90"
@@ -124,14 +131,6 @@ end module DAMASK_interface
 #include "homogenization_RGC.f90"
 #include "homogenization.f90"
 #include "CPFEM.f90"
-#include "constitutive_damage.f90"
-#include "damage_none.f90"
-#include "damage_gradient.f90"
-#include "constitutive_thermal.f90"
-#include "thermal_none.f90"
-#include "thermal_conduction.f90"
-#include "thermal_adiabatic.f90"
-
 
 !--------------------------------------------------------------------------------------------------
 !> @brief This is the MSC.Marc user subroutine for defining material behavior
diff --git a/code/crystallite.f90 b/code/crystallite.f90
index ab28607de..070bf5ed6 100644
--- a/code/crystallite.f90
+++ b/code/crystallite.f90
@@ -2194,7 +2194,7 @@ subroutine crystallite_integrateStateRKCK45()
                   .or. .not. iand(debug_level(debug_crystallite), debug_levelSelective) /= 0_pInt)) then
          write(6,'(a,i8,1x,i3,1x,i3,/)') '<< CRYST >> updateState at el ip g ',e,i,g
          write(6,'(a,/,(12x,12(f12.1,1x)),/)') '<< CRYST >> absolute residuum tolerance', &
-               stateResiduum(1:mySizeDotState,g,i,e) / plasticState(p)%aTolState(1:mySizePlasticDotState,cc)
+               stateResiduum(1:mySizeDotState,g,i,e) / plasticState(p)%aTolState(1:mySizePlasticDotState)
          write(6,'(a,/,(12x,12(f12.1,1x)),/)') '<< CRYST >> relative residuum tolerance', &
                relStateResiduum(1:mySizeDotState,g,i,e) / rTol_crystalliteState
          write(6,'(a,/,(12x,12(e12.5,1x)),/)') '<< CRYST >> dotState', &
@@ -2337,7 +2337,6 @@ subroutine crystallite_integrateStateAdaptiveEuler()
    constitutive_thermal_maxSizeDotState
  
  implicit none
-
  integer(pInt) :: &
    e, &                                                                                             ! element index in element loop
    i, &                                                                                             ! integration point index in ip loop