Add new flag and improve warning messages.