Minor messaging cleanup