Small merge fixes