Ivy merge fixes.