Fix wrong type
Fix ignorance of warnings
Merge branch 'develop'