Fix package names, urls, add cld2 requirement