Known merge fixes