(OSX) Bake in 7zip support - some compatibility/build fixes
for OSX