Fix unpacking commands