minor fixes
Merge branch 'dev-merge-mvp19-step4' of https://github.com/goobito/sud into staging