Small bug fixes
Merge branch 'release-0.5/#8' into develop