iOS host fixes post merge