Update following message_switch unix API change