diff --git a/matlab/getH.m b/matlab/getH.m
index 17ed4ba44..afdb8e169 100644
--- a/matlab/getH.m
+++ b/matlab/getH.m
@@ -19,10 +19,18 @@ function [H, dA, dOm, Hss, gp, d2A, d2Om, H2ss] = getH(A, B, M_,oo_,options_,kro
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-if nargin<6 || isempty(kronflag), kronflag = 0; end
-if nargin<7 || isempty(indx), indx = [1:M_.param_nbr]; end,
-if nargin<8 || isempty(indexo), indexo = []; end,
-if nargin<9 || isempty(iv), iv = (1:length(A))'; end,
+if nargin<6 || isempty(kronflag)
+    kronflag = 0; 
+end
+if nargin<7 || isempty(indx)
+    indx = []; 
+end
+if nargin<8 || isempty(indexo)
+    indexo = []; 
+end
+if nargin<9 || isempty(iv)
+    iv = (1:length(A))'; 
+end
 
 [I,J]=find(M_.lead_lag_incidence');
 yy0=oo_.dr.ys(I);
diff --git a/matlab/getJJ.m b/matlab/getJJ.m
index e27ed22b8..de13063eb 100644
--- a/matlab/getJJ.m
+++ b/matlab/getJJ.m
@@ -17,10 +17,18 @@ function [JJ, H, gam, gp, dA, dOm, dYss] = getJJ(A, B, M_,oo_,options_,kronflag,
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-if nargin<7 || isempty(indx), indx = [1:M_.param_nbr];, end,
-if nargin<8 || isempty(indexo), indexo = [];, end,
-if nargin<10 || isempty(nlags), nlags=3; end,
-if nargin<11 || isempty(useautocorr), useautocorr=0; end,
+if nargin<7 || isempty(indx)
+%     indx = [1:M_.param_nbr];
+end,
+if nargin<8 || isempty(indexo)
+    indexo = [];
+end,
+if nargin<10 || isempty(nlags)
+    nlags=3; 
+end
+if nargin<11 || isempty(useautocorr)
+    useautocorr=0; 
+end
 
 %   if useautocorr,
 warning('off','MATLAB:divideByZero')
diff --git a/matlab/identification_analysis.m b/matlab/identification_analysis.m
index dccb005cd..6e5e9521c 100644
--- a/matlab/identification_analysis.m
+++ b/matlab/identification_analysis.m
@@ -118,14 +118,14 @@ if info(1)==0,
     ide_strength_J_prior=NaN(1,nparam);
     if init, %~isempty(indok),
         normaliz = abs(params);
-        if prior_exist,
+        if prior_exist,           
             if ~isempty(estim_params_.var_exo),
-                normaliz1 = estim_params_.var_exo(:,7); % normalize with prior standard deviation
+                normaliz1 = estim_params_.var_exo(:,7)'; % normalize with prior standard deviation
             else
                 normaliz1=[];
             end
             if ~isempty(estim_params_.param_vals),
-                normaliz1 = [normaliz1; estim_params_.param_vals(:,7)]'; % normalize with prior standard deviation
+                normaliz1 = [normaliz1 estim_params_.param_vals(:,7)']; % normalize with prior standard deviation
             end
             %                         normaliz = max([normaliz; normaliz1]);
             normaliz1(isinf(normaliz1)) = 1;
diff --git a/matlab/identification_checks.m b/matlab/identification_checks.m
index 78b12e174..a4dc55532 100644
--- a/matlab/identification_checks.m
+++ b/matlab/identification_checks.m
@@ -82,7 +82,7 @@ end
 
 
 ixnoJ = 0;
-if rankJ<npar || rankJJ<npar || min(1-McoJ)<1.e-10
+if npar>0 && (rankJ<npar || rankJJ<npar || min(1-McoJ)<1.e-10)
     %         - find out which parameters are involved
     %   disp('Some parameters are NOT identified by the moments included in J')
     %   disp(' ')