Improve curl/clone detection