More messaging tweaks and updates