Fix unpacking binary packages
Minor clean up