diff --git a/src/classes/PMusrCanvas.cpp b/src/classes/PMusrCanvas.cpp
index 9af99112..3971b610 100644
--- a/src/classes/PMusrCanvas.cpp
+++ b/src/classes/PMusrCanvas.cpp
@@ -1014,8 +1014,13 @@ void PMusrCanvas::HandleCmdKey(Int_t event, Int_t x, Int_t y, TObject *selected)
   if (event != kKeyPress)
      return;
 
-  if (fBatchMode)
+  if (fBatchMode) {
+    if (fStartWithAvg) { // this is needed to get the averaging in the batch mode
+      HandleAverage();
+      PlotAverage(true);
+    }
     return;
+  }
 
   // handle keys and popup menu entries
   enum eKeySwitch {kNotRelevant, kData, kDiffData, kFourier, kDiffFourier, kFourierDiff};
@@ -1553,7 +1558,10 @@ void PMusrCanvas::SaveGraphicsAndQuit(Char_t *fileName, Char_t *graphicsFormat)
     return;
   }
 
-  sprintf(ext, "_%d", fPlotNumber);
+  if (fStartWithFourier)
+    sprintf(ext, "_%d_F", fPlotNumber);
+  else
+    sprintf(ext, "_%d", fPlotNumber);
   str.Replace(idx, size, ext, strlen(ext));
   idx += strlen(ext);
   size = strlen(ext);
diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm
index d8e202af..f2a3adfe 100644
--- a/src/external/MuSRFitGUI/MSR.pm
+++ b/src/external/MuSRFitGUI/MSR.pm
@@ -278,6 +278,7 @@ sub CreateMSRUni {
 		}
 		if ($All{"Data1$NHist"} ne $EMPTY && $All{"Data2$NHist"} ne $EMPTY) {
 		    $Data_Line =$Data_Line."    ".$All{"Data1$NHist"}."    ".$All{"Data2$NHist"};
+<<<<<<< HEAD
 		}
 		if ($All{"t0$NHist"} ne $EMPTY) {
 		    $T0_Line=$T0_Line."      ".$All{"t0$NHist"};  
@@ -1262,7 +1263,6 @@ sub ExportParams {
             push( @FitTypes, $All{"FitType$i"} );           
         }
     }
-
     # Get theory block to determine the size of the table
     my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateTheory(@FitTypes);
     # For now the line below does not work. Why?    
diff --git a/src/musredit_qt5/musredit/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp
index 4fc18ab2..c828ca07 100644
--- a/src/musredit_qt5/musredit/PTextEdit.cpp
+++ b/src/musredit_qt5/musredit/PTextEdit.cpp
@@ -706,8 +706,8 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/msr2data-dark.svg");
   else
     iconName = QString(":/icons/msr2data-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Msr2Data" ), this );
-  a->setShortcut( tr("Alt+M") );
+  a = new QAction( QIcon( QPixmap(iconName) ), tr( "Msr&2Data" ), this );
+  a->setShortcut( tr("Alt+2") );
   a->setStatusTip( tr("Start msr2data interface") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrMsr2Data() ) );
   menu->addAction(a);