Updates to circumvent YQL issues.