diff --git a/matlab/+mom/run.m b/matlab/+mom/run.m
index 969fc13c7b36374b3a6ab12b9ac3f604549f814a..0e761909f5634eda70dcfd87620c2074c1bf4156 100644
--- a/matlab/+mom/run.m
+++ b/matlab/+mom/run.m
@@ -364,7 +364,7 @@ analytic_jacobian_optimizers = [1, 3, 4, 13, 101]; %these are currently supporte
 options_mom_.initialize_estimated_parameters_with_the_prior_mode = 0; % needed by set_prior.m
 options_mom_.figures.textwidth = 0.8; %needed by plot_priors.m
 options_mom_.ramsey_policy = 0; % needed by evaluate_steady_state
-options_mom_.debug = false; %needed by resol.m
+options_mom_ = set_default_option(options_mom_,'debug',false); %neeeded by e.g. check_plot
 options_mom_.risky_steadystate = false; %needed by resol
 options_mom_.threads = options_.threads; %needed by resol
 options_mom_.jacobian_flag = true;
diff --git a/matlab/dynare_sensitivity.m b/matlab/dynare_sensitivity.m
index 3e9b29239639fae720e33bd8e339568cbb8b703c..9bdb5b61d463664e23109e058eaff668a4b3454a 100644
--- a/matlab/dynare_sensitivity.m
+++ b/matlab/dynare_sensitivity.m
@@ -84,7 +84,10 @@ elseif isfield(options_gsa,'neighborhood_width') && options_gsa.neighborhood_wid
     options_.mode_file='';
 end
 
-options_.order = 1;
+if options_.order~=1
+    warning('dynare_sensitivity: dynare_sensitivity does only support order=1, resetting to order=1.')
+    options_.order = 1;
+end
 
 if ~isempty(options_gsa.datafile) || isempty(bayestopt_) || options_gsa.rmse
     if isempty(options_gsa.datafile) && options_gsa.rmse