urllib3 compat improvements