couple more merge fixes