Merge "Fix workarounds for archive paths"