Curl related changes

some minor modifications