Some curl improvements