Merge branch 'develop'
Small fixes