Minor fixes
Last fixes
Merge branch 'develop'