2 packaging fixes