More warnings fixed.