Some more merge fixes