Couple more merge fixes