Fix more warnings

And some more....