More fixing of messages