few more merge fixes