Macosx package fixes