xmvn/ivy fixes