Fix compile after upstream merge