More packaging problems fixed