Handle binary downloads

Also a more reliable fix for #2