Correction of some warnings