Fix more issues
Merge branch 'MH-894' into dev