Curl fixes