Tweaks to message passing to make it more robust.