Fix the build from commits d90dd1fd e81da3a2