More packaging updates