Reduced the number of warnings.