Fix errors with non existing dirs when unpacking