More packaging fixes.