Initial MacOSX build changes [broken]