Fixed some warings
Merge branch 'fix-warnings' into develop