Add 'Host' runtime case to a couple more switches