Tweaks to get messaging working