Some merge fixes