yet more packing tweaks