Re: Packing fixes (supersedes my previous packing fix patch)