Mac build fixes, more needed