Minor messaging improvements.