WIP - Making OSX build work... almost