Updating flags for better warning control