tweaks for unpacker