Mac build support