Minor. Less WARN messages.