Corrected warnings