Correction of warnings