HP: Some messaging tweaks