Fix message destructuring