Zip auto selection + fixes