Fix messaging bugs.