Fix message passing for sample setup.