Fixing unpack issues on linux