More packaging fixes