New warnings corrected