diff --git a/matlab/gsa/map_calibration.m b/matlab/gsa/map_calibration.m
index 7f319610e02c50e205c003f83c5b6fd54a1a4d66..8ee08cebaff631512930e1f849d6b5c295954a7a 100644
--- a/matlab/gsa/map_calibration.m
+++ b/matlab/gsa/map_calibration.m
@@ -42,7 +42,6 @@ end
 pvalue_ks = DynareOptions.opt_gsa.pvalue_ks;
 indx_irf = [];
 indx_moment = [];
-DynareOptions.nodisplay = 1;
 init = ~DynareOptions.opt_gsa.load_stab;
 
 options_mcf.pvalue_ks = DynareOptions.opt_gsa.pvalue_ks;
diff --git a/matlab/gsa/mcf_analysis.m b/matlab/gsa/mcf_analysis.m
index cec1054cd481ebf4ba6ef1c5e0ee5289abef70d4..023985923cfa9496d2def16e33e126edcaaea02d 100644
--- a/matlab/gsa/mcf_analysis.m
+++ b/matlab/gsa/mcf_analysis.m
@@ -34,6 +34,8 @@ if DynareOptions.TeX
     else
         param_names_tex = options_mcf.param_names_tex;
     end
+else
+    param_names_tex = strrep(options_mcf.param_names,'_','\_');
 end
 amcf_name = options_mcf.amcf_name;
 amcf_title = options_mcf.amcf_title;
@@ -78,7 +80,7 @@ if ~isempty(indmcf) && ~DynareOptions.nograph
     skipline()
     xx=[];
     if ~ isempty(xparam1), xx=xparam1(indmcf); end
-    scatter_mcf(lpmat(ibeha,indmcf),lpmat(inobeha,indmcf), param_names(indmcf), ...
+    scatter_mcf(lpmat(ibeha,indmcf),lpmat(inobeha,indmcf), param_names_tex(indmcf), ...
                 '.', [fname_,'_',amcf_name], OutputDirectoryName, amcf_title,xx, DynareOptions, ...
                 beha_title, nobeha_title)
 end
diff --git a/matlab/gsa/scatter_mcf.m b/matlab/gsa/scatter_mcf.m
index 211b2e74bb47b8fb5fc3b2dad5263d72b035de47..facea3cfa814f33833b00f505b75254b1191bc23 100644
--- a/matlab/gsa/scatter_mcf.m
+++ b/matlab/gsa/scatter_mcf.m
@@ -143,7 +143,7 @@ for i = 1:p
         end
         if i==1
             if nflag == 1
-                ylabel(vnames(j,:),'Rotation',45,'interpreter','none', ...
+                ylabel(vnames(j,:),'Rotation',45, ...
                        'HorizontalAlignment','right','VerticalAlignment','middle');
             else
                 ylabel([num2str(j),' '],'Rotation',90)
@@ -151,7 +151,7 @@ for i = 1:p
         end
         if j==1
             if nflag == 1
-                title(vnames(i,:),'interpreter','none','Rotation',45, ...
+                title(vnames(i,:),'Rotation',45, ...
                       'HorizontalAlignment','left','VerticalAlignment','bottom')
             else
                 title(num2str(i))