Hotfix v0.8.1

Merged Ghost User requested to merge servant into master

Minor fixes for v0.8

Merge request reports