Fix the message issues