Minor messaging tweaks