Some packing fixes