Fix warnings from last upstream merge