Upgrade following message_switch/unix interface change