Merge "Fix typo and Mac build"