Fixes issues with extracting and linking of archives.
Fixes other issues from previous update.