mse_baseline fixes
Merge branch 'hotfix/mse_fixes'