OSX packaging fixes