fixes to messaging