[Mac] Fix some semantic breakage introduced by the unified api migration