Fix message dependencies