diff --git a/matlab/dsge_likelihood.m b/matlab/dsge_likelihood.m
index 1e7eada0f..3ac354605 100644
--- a/matlab/dsge_likelihood.m
+++ b/matlab/dsge_likelihood.m
@@ -457,7 +457,12 @@ switch DynareOptions.lik_init
     error('dsge_likelihood:: Unknown initialization approach for the Kalman filter!')
 end
 
-if analytic_derivation
+if analytic_derivation,
+    offset = EstimatedParameters.nvx;
+    offset = offset+EstimatedParameters.nvn;
+    offset = offset+EstimatedParameters.ncx;
+    offset = offset+EstimatedParameters.ncn;
+
     no_DLIK = 0;
     full_Hess = analytic_derivation==2;
     asy_Hess = analytic_derivation==-2;
diff --git a/matlab/lpdfnorm.m b/matlab/lpdfnorm.m
index 9afdd2b6d..cb7d7ebaa 100644
--- a/matlab/lpdfnorm.m
+++ b/matlab/lpdfnorm.m
@@ -35,9 +35,9 @@ if nargin<2, a=0; end
 ldens = -log(b) -.5*log(2*pi) - .5*((x-a)./b).*((x-a)./b) ;
 
 if nargout >1 
-    Dldens =  - (1/b)*((x-a)/b) ;
+    Dldens =  - (1./b).*((x-a)./b) ;
 end
 
 if nargout == 3 
-    D2ldens =  - (1/b)^2 ;
+    D2ldens =  - (1./b).^2 ;
 end
\ No newline at end of file