diff --git a/matlab/calibrate_mh_scale_parameter.m b/matlab/calibrate_mh_scale_parameter.m
index b1e7feb992c15dccacdf82b289cb697712045b9d..41089105973153722ffdfa4bc80525e071cdc237 100644
--- a/matlab/calibrate_mh_scale_parameter.m
+++ b/matlab/calibrate_mh_scale_parameter.m
@@ -73,7 +73,7 @@ while j<=options.maxiter
     prtfrc = j/options.maxiter;
     % Update the waitbar
     if ~mod(j, 10)
-        dyn_waitbar(prtfrc, hh, sprintf('Acceptance ratio [during last 500]: %f [%f]', isux/j, jsux/jj));
+        dyn_waitbar(prtfrc, hh, sprintf('Acceptance ratio [during last %u]: %f [%f]', options.stepsize, isux/j, jsux/jj));
     end
     % Adjust the value of the scale parameter.
     if ~mod(j, options.stepsize)
diff --git a/matlab/initial_estimation_checks.m b/matlab/initial_estimation_checks.m
index fa4acfcde8211473a2236eba5ffb4719ff9d1a97..36096b87891044ea81e96d3e82f18bb098d41781 100644
--- a/matlab/initial_estimation_checks.m
+++ b/matlab/initial_estimation_checks.m
@@ -290,6 +290,10 @@ if ~isequal(DynareOptions.mode_compute,11)
     disp(['Initial value of the log posterior (or likelihood): ' num2str(-fval)]);
 end
 
+if DynareOptions.mh_tune_jscale.status && (DynareOptions.mh_tune_jscale.maxiter<DynareOptions.mh_tune_jscale.stepsize)
+    warning('You specified mh_tune_jscale, but the maximum number of iterations is smaller than the step size. No update will take place.')
+end
+
 function evaluate_expression(expression,M_,oo_)
 % function evaluate_expression(expression,M_,oo_)
 %evaluates expressions relying on M_ and oo_ having their original names