Minor bugfixes
Merge branch 'hotfix/2.0.4.2'