Mac packaging: better handling of binary architecture + other improvements