More adoptions for packing under mingw64