Fixes so portal doesn't break
Merge branch 'hotfix_0.3.1' into develop