Merge "Fix mac build (hopefully)"