Changes for Mac build