Some changes for curl