Fixing messages bugs.