Fix more compilation warnings