Mac build improvements