Customer merge fixes