Mac packaging fixes