Fix more compilation warnings
Fix more compilation warnings