Fix messaging integration errors.
Fix messaging integration bugs.