More packaging improvements