Merge "Fix mac build of bit"