FIX: OSX packaging fixes