Fix for warning messages