Further Mac build cleanups