Fix warnings
Fix warnings
Merge branch 'dev'