Some fix of warning messages