Fix more compiler warnings