Fix all messages etc