Better combo curl/wget handling

Fixes #451