Fixes for the superbuild and other things noticed in !4939 (merged).
Cc: @paul.lafoix @utkarsh.ayachit