Modifications due to changed in YQL library

Minor modifications due to changed in YQL library