Several warnings fixed.