Fixing the warning notifications