Merge "Fix mac build" into main