Fix after merge fixes