CD-3992 : fix some warnings.