diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc
index 6e90b5847..c06330782 100644
--- a/rtgui/adjuster.cc
+++ b/rtgui/adjuster.cc
@@ -450,6 +450,7 @@ void Adjuster::showEditedCB () {
         hbox->pack_start (*editedCheckBox, Gtk::PACK_SHRINK, 2);
         hbox->reorder_child (*editedCheckBox, 0);
         editedChange = editedCheckBox->signal_toggled().connect( sigc::mem_fun(*this, &Adjuster::editedToggled) );
+        editedCheckBox->show();
     }
 }
 
diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc
index 1bb797c38..8031270d7 100644
--- a/rtgui/colorappearance.cc
+++ b/rtgui/colorappearance.cc
@@ -1099,7 +1099,7 @@ void ColorAppearance::algoChanged () {
 		schroma->show();
 		qbright->hide();
 		colorh->hide();
-		tonecie->hide();		
+		tonecie->hide();
 //		sharpcie->hide();
 		curveEditorG->show();
 		curveEditorG2->show();
@@ -1132,7 +1132,7 @@ void ColorAppearance::algoChanged () {
 		schroma->show();
 		qbright->show();
 		colorh->show();
-		tonecie->show();		
+		tonecie->show();
 //		sharpcie->show();
 //		sharpcie->hide();
 		curveEditorG->show();
@@ -1167,19 +1167,18 @@ void ColorAppearance::setBatchMode (bool batchMode) {
 	wbmodel->append_text (M("GENERAL_UNCHANGED"));
 	algo->append_text (M("GENERAL_UNCHANGED"));
 	toneCurveMode->append_text (M("GENERAL_UNCHANGED"));
-//	toneCurveMode2->append_text (M("GENERAL_UNCHANGED"));
-//	toneCurveMode3->append_text (M("GENERAL_UNCHANGED"));
+	toneCurveMode2->append_text (M("GENERAL_UNCHANGED"));
+	toneCurveMode3->append_text (M("GENERAL_UNCHANGED"));
 
 	curveEditorG->setBatchMode (batchMode);
-//	curveEditorG2->setBatchMode (batchMode);
-//	curveEditorG3->setBatchMode (batchMode);
+	curveEditorG2->setBatchMode (batchMode);
+	curveEditorG3->setBatchMode (batchMode);
 }
 
 void ColorAppearance::updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve, LUTu & histCLurve, LUTu & histLLCurve, LUTu & histLCAM,  LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma){
 
 	shape->updateBackgroundHistogram (histLCAM);
 	shape3->updateBackgroundHistogram (histCCAM);
-	
 }
 
 
diff --git a/rtgui/crop.cc b/rtgui/crop.cc
index c5ed3af33..92c2e1617 100644
--- a/rtgui/crop.cc
+++ b/rtgui/crop.cc
@@ -23,7 +23,6 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-extern Glib::ustring argv0;
 extern Options options;
 
 class RefreshSpinHelper {
@@ -323,11 +322,11 @@ void Crop::read (const ProcParams* pp, const ParamsEdited* pedited) {
         xDirty = pedited->crop.x;
         yDirty = pedited->crop.y;
         if (!pedited->crop.ratio)
-            ratio->set_active (8);
-        if (!pedited->crop.orientation) 
-            orientation->set_active (2);
-        if (!pedited->crop.guide) 
-            guide->set_active (7);
+            ratio->set_active_text (M("GENERAL_UNCHANGED"));
+        if (!pedited->crop.orientation)
+            orientation->set_active_text (M("GENERAL_UNCHANGED"));
+        if (!pedited->crop.guide)
+            guide->set_active_text (M("GENERAL_UNCHANGED"));
         enabled->set_inconsistent (!pedited->crop.enabled);
         fixr->set_inconsistent (!pedited->crop.fixratio);
     }
@@ -386,9 +385,9 @@ void Crop::write (ProcParams* pp, ParamsEdited* pedited) {
 
     if (pedited) {
         pedited->crop.enabled       = !enabled->get_inconsistent();
-        pedited->crop.ratio         = ratio->get_active_row_number() != 9;
-        pedited->crop.orientation   = orientation->get_active_row_number() != 2;
-        pedited->crop.guide         = guide->get_active_row_number() != 9;
+        pedited->crop.ratio         = ratio->get_active_text() != M("GENERAL_UNCHANGED");
+        pedited->crop.orientation   = orientation->get_active_text() != M("GENERAL_UNCHANGED");
+        pedited->crop.guide         = guide->get_active_text() != M("GENERAL_UNCHANGED");
         pedited->crop.fixratio      = !fixr->get_inconsistent();
         pedited->crop.w             = wDirty;
         pedited->crop.h             = hDirty;
@@ -1056,8 +1055,8 @@ void Crop::setBatchMode (bool batchMode) {
 
     ToolPanel::setBatchMode (batchMode);
 
-	ratio->append_text ("(Unchanged)");
-	orientation->append_text ("(Unchanged)");
-	guide->append_text ("(Unchanged)");
+    ratio->append_text (M("GENERAL_UNCHANGED"));
+    orientation->append_text (M("GENERAL_UNCHANGED"));
+    guide->append_text (M("GENERAL_UNCHANGED"));
     removeIfThere (this, ppibox);
 }
diff --git a/rtgui/gradient.cc b/rtgui/gradient.cc
index 0eb43b5de..2565c55cd 100644
--- a/rtgui/gradient.cc
+++ b/rtgui/gradient.cc
@@ -56,7 +56,7 @@ void Gradient::read (const ProcParams* pp, const ParamsEdited* pedited)
 		strength->setEditedState (pedited->gradient.strength ? Edited : UnEdited);
 		centerX->setEditedState (pedited->gradient.centerX ? Edited : UnEdited);
 		centerY->setEditedState (pedited->gradient.centerY ? Edited : UnEdited);
-		enabled->set_inconsistent (!pedited->gradient.enabled);
+		enabled->set_inconsistent (multiImage && !pedited->gradient.enabled);
 	}
 
 	enaConn.block (true);
diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc
index 7a15af731..1a3fc9bfc 100644
--- a/rtgui/tonecurve.cc
+++ b/rtgui/tonecurve.cc
@@ -599,6 +599,8 @@ void ToneCurve::waitForAutoExp () {
     saturation->setEnabled (false);
     curveEditorG->set_sensitive (false);
     toneCurveMode->set_sensitive (false);
+    curveEditorG2->set_sensitive (false);
+    toneCurveMode2->set_sensitive (false);
     hrenabled->set_sensitive(false);
     method->set_sensitive(false);
 }
@@ -633,6 +635,8 @@ void ToneCurve::enableAll () {
     saturation->setEnabled (true);
     curveEditorG->set_sensitive (true);
     toneCurveMode->set_sensitive (true);
+    curveEditorG2->set_sensitive (true);
+    toneCurveMode2->set_sensitive (true);
     hrenabled->set_sensitive(true);
     method->set_sensitive(true);
 }
@@ -682,8 +686,10 @@ void ToneCurve::setBatchMode (bool batchMode) {
     saturation->showEditedCB ();
 
     toneCurveMode->append_text (M("GENERAL_UNCHANGED"));
+    toneCurveMode2->append_text (M("GENERAL_UNCHANGED"));
 
     curveEditorG->setBatchMode (batchMode);
+    curveEditorG2->setBatchMode (batchMode);
 }
 
 void ToneCurve::setAdjusterBehavior (bool expadd, bool hlcompadd, bool hlcompthreshadd, bool bradd, bool blackadd, bool shcompadd, bool contradd, bool satadd) {