Fix some warnings
Merge branch 'develop'