Fix OSX build and package