Fix message issues, hopefully