Minor updates to messaging code.