Fix  messages