[No review required] cURL fixes