Corrections to pack/unpack.