Fix type conversion compiler warnings (from dadeos)
Merge branch 'Dadeos-compilation_warnings'