small fixes
more fixes
Merge remote-tracking branch 'origin/Sprint-5' into auto-testing