Minor bugfixes
Merge branch 'develop'