Fix compile after merge