Minor merge fixes