Fix the messages