Correction of warnings and comments