Tweaks to messaging