Added 7zip and fixed build