Fix more gcc warnings