Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp	(revision 14703)
+++ /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp	(revision 14704)
@@ -237,7 +237,4 @@
 			Ke=CreateKMatrixDiagnosticMacAyeal();
 			break;
-		case AdjointHorizAnalysisEnum:
-			Ke=CreateKMatrixAdjointMacAyeal();
-			break;
 		case DiagnosticHutterAnalysisEnum:
 			Ke=CreateKMatrixDiagnosticHutter();
@@ -263,4 +260,7 @@
 		case AdjointBalancethicknessAnalysisEnum:
 			Ke=CreateKMatrixAdjointBalancethickness();
+			break;
+		case AdjointHorizAnalysisEnum:
+			Ke=CreateKMatrixAdjointMacAyeal();
 			break;
 		#endif
Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp	(revision 14703)
+++ /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp	(revision 14704)
@@ -266,10 +266,8 @@
 
 	switch(analysis_type){
-		#ifdef _HAVE_DIAGNOSTIC_
+		#ifdef _HAVE_THERMAL_
 		case ThermalAnalysisEnum:
 			pe=PenaltyCreatePVectorThermal(kmax);
 			break;
-		#endif
-		#ifdef _HAVE_THERMAL_
 		case MeltingAnalysisEnum:
 			pe=PenaltyCreatePVectorMelting(kmax);
Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp	(revision 14703)
+++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp	(revision 14704)
@@ -28,17 +28,19 @@
 	/*Do we have penalties linked to rifts? In this case, run our special rifts penalty 
 	 * management routine, otherwise, skip : */
+	
+	/*No constraints management by default!:*/
+	num_unstable_constraints=0;
+	converged=1;
+
+	#ifdef _HAVE_RIFTS_
 	if (RiftIsPresent(loads,analysis_type)){
 		RiftConstraintsState(&converged,&num_unstable_constraints,loads,min_mechanical_constraints,analysis_type);
 	}
+	#endif
 	#ifdef _HAVE_THERMAL_
-	else if(ThermalIsPresent(loads,analysis_type)){
+	if(ThermalIsPresent(loads,analysis_type)){
 		ThermalConstraintsState(loads,&converged,&num_unstable_constraints,analysis_type);
 	}
 	#endif
-	else{
-		/*Do nothing, no constraints management!:*/
-		num_unstable_constraints=0;
-		converged=1;
-	}
 
 	/*Assign output pointers: */
Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp	(revision 14703)
+++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp	(revision 14704)
@@ -154,4 +154,5 @@
 
 	/*Create Riffront loads for rifts: */
+	#ifdef _HAVE_RIFTS_
 	if(numrifts){
 		iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsRiftstructEnum);
@@ -166,4 +167,5 @@
 		xDelete<IssmDouble>(riftinfo);
 	}
+	#endif
 
 	/*Assign output pointer: */