Some bugfixes
Merge branch 'hotfix/v0.78'