More post merge fixes