Updated for Mac build.