Merge "Mac build fix"