Remove even more gcc warnings