More fixes for gcc warnings