Fix more warnings (gcc 4.7)