diff --git a/matlab/+mom/get_data_moments.m b/matlab/+mom/get_data_moments.m
index 0a2ced1c4..31a53d7c7 100644
--- a/matlab/+mom/get_data_moments.m
+++ b/matlab/+mom/get_data_moments.m
@@ -35,7 +35,7 @@ function [dataMoments, m_data] = get_data_moments(data, oo_, matched_moments_, o
 % -------------------------------------------------------------------------
 % Author(s): 
 % o Willi Mutschler (willi@mutschler.eu)
-% o Johannes Pfeifer (jpfeifer@uni-koeln.de)
+% o Johannes Pfeifer (johannes.pfeifer@unibw.de)
 % =========================================================================
 
 % Initialization
diff --git a/matlab/+mom/optimal_weighting_matrix.m b/matlab/+mom/optimal_weighting_matrix.m
index d9f8a64e1..c09e56fd3 100644
--- a/matlab/+mom/optimal_weighting_matrix.m
+++ b/matlab/+mom/optimal_weighting_matrix.m
@@ -38,7 +38,7 @@ function W_opt = optimal_weighting_matrix(m_data, moments, q_lag)
 % -------------------------------------------------------------------------
 % Author(s): 
 % o Willi Mutschler (willi@mutschler.eu)
-% o Johannes Pfeifer (jpfeifer@uni-koeln.de)
+% o Johannes Pfeifer (johannes.pfeifer@unibw.de)
 % =========================================================================
 
 % Initialize
diff --git a/matlab/+mom/run.m b/matlab/+mom/run.m
index 1a57a9be4..3f750906e 100644
--- a/matlab/+mom/run.m
+++ b/matlab/+mom/run.m
@@ -590,7 +590,7 @@ fprintf('\n==== Method of Moments Estimation (%s) Completed ====\n\n',options_mo
 %reset warning state
 warning_config;
 
-if isoctave && isfield(options_, 'prior_restrictions') && ...
+if isoctave && isfield(options_mom_, 'prior_restrictions') && ...
    isfield(options_mom_.prior_restrictions, 'routine')
     % Octave crashes if it tries to save function handles (to the _results.mat file)
     % See https://savannah.gnu.org/bugs/?43215
diff --git a/matlab/+mom/standard_errors.m b/matlab/+mom/standard_errors.m
index e1b11a888..8de031a3f 100644
--- a/matlab/+mom/standard_errors.m
+++ b/matlab/+mom/standard_errors.m
@@ -47,7 +47,7 @@ function [SE_values, Asympt_Var] = standard_errors(xparam, objective_function, B
 % -------------------------------------------------------------------------
 % Author(s): 
 % o Willi Mutschler (willi@mutschler.eu)
-% o Johannes Pfeifer (jpfeifer@uni-koeln.de)
+% o Johannes Pfeifer (johannes.pfeifer@unibw.de)
 % =========================================================================
 
 % Some dimensions