A few more warnings fixed.