Fix errors on messages