Small merge fixes again